diff --git a/.clang-format b/.clang-format
index df0aa3179b..3dedfeecf0 100644
--- a/.clang-format
+++ b/.clang-format
@@ -17,8 +17,8 @@ AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: false
-BinPackArguments: false
-BinPackParameters: false
+BinPackArguments: true
+BinPackParameters: true
 BraceWrapping:
   AfterClass:      true
   AfterControlStatement: true
diff --git a/src/openrct2-ui/CursorRepository.cpp b/src/openrct2-ui/CursorRepository.cpp
index e83e888ab2..19a1e2f687 100644
--- a/src/openrct2-ui/CursorRepository.cpp
+++ b/src/openrct2-ui/CursorRepository.cpp
@@ -98,12 +98,8 @@ SDL_Cursor* CursorRepository::Create(const CursorData* cursorInfo, uint8_t scale
     auto mask = scaleDataArray(cursorInfo->Mask, CURSOR_BIT_WIDTH, CURSOR_HEIGHT, static_cast<size_t>(integer_scale));
 
     cursor = SDL_CreateCursor(
-        data,
-        mask,
-        BASE_CURSOR_WIDTH * integer_scale,
-        BASE_CURSOR_HEIGHT * integer_scale,
-        cursorInfo->HotSpot.X * integer_scale,
-        cursorInfo->HotSpot.Y * integer_scale);
+        data, mask, BASE_CURSOR_WIDTH * integer_scale, BASE_CURSOR_HEIGHT * integer_scale,
+        cursorInfo->HotSpot.X * integer_scale, cursorInfo->HotSpot.Y * integer_scale);
 
     free(data);
     free(mask);
diff --git a/src/openrct2-ui/UiContext.Linux.cpp b/src/openrct2-ui/UiContext.Linux.cpp
index 4440c6b734..ee2bda73f7 100644
--- a/src/openrct2-ui/UiContext.Linux.cpp
+++ b/src/openrct2-ui/UiContext.Linux.cpp
@@ -125,12 +125,8 @@ namespace OpenRCT2::Ui
                     std::string action = (desc.Type == FILE_DIALOG_TYPE::OPEN) ? "--getopenfilename" : "--getsavefilename";
                     std::string filter = GetKDialogFilterString(desc.Filters);
                     std::string cmd = String::StdFormat(
-                        "%s --title '%s' %s '%s' '%s'",
-                        executablePath.c_str(),
-                        desc.Title.c_str(),
-                        action.c_str(),
-                        desc.InitialDirectory.c_str(),
-                        filter.c_str());
+                        "%s --title '%s' %s '%s' '%s'", executablePath.c_str(), desc.Title.c_str(), action.c_str(),
+                        desc.InitialDirectory.c_str(), filter.c_str());
                     std::string output;
                     if (Execute(cmd, &output) == 0)
                     {
@@ -148,13 +144,8 @@ namespace OpenRCT2::Ui
                     }
                     std::string filters = GetZenityFilterString(desc.Filters);
                     std::string cmd = String::StdFormat(
-                        "%s %s --filename='%s/' %s --title='%s' / %s",
-                        executablePath.c_str(),
-                        action.c_str(),
-                        desc.InitialDirectory.c_str(),
-                        flags.c_str(),
-                        desc.Title.c_str(),
-                        filters.c_str());
+                        "%s %s --filename='%s/' %s --title='%s' / %s", executablePath.c_str(), action.c_str(),
+                        desc.InitialDirectory.c_str(), flags.c_str(), desc.Title.c_str(), filters.c_str());
                     std::string output;
                     if (Execute(cmd, &output) == 0)
                     {
diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp
index 0971d9eb9b..cc9fe87e27 100644
--- a/src/openrct2-ui/UiContext.cpp
+++ b/src/openrct2-ui/UiContext.cpp
@@ -767,12 +767,7 @@ private:
     }
 
     static void DrawRainWindow(
-        IRainDrawer* rainDrawer,
-        rct_window* original_w,
-        int16_t left,
-        int16_t right,
-        int16_t top,
-        int16_t bottom,
+        IRainDrawer* rainDrawer, rct_window* original_w, int16_t left, int16_t right, int16_t top, int16_t bottom,
         DrawRainFunc drawFunc)
     {
         rct_window* w{};
diff --git a/src/openrct2-ui/audio/AudioMixer.cpp b/src/openrct2-ui/audio/AudioMixer.cpp
index f9810c736a..ce9a5992ce 100644
--- a/src/openrct2-ui/audio/AudioMixer.cpp
+++ b/src/openrct2-ui/audio/AudioMixer.cpp
@@ -272,12 +272,7 @@ namespace OpenRCT2::Audio
             if (streamformat != _format)
             {
                 if (SDL_BuildAudioCVT(
-                        &cvt,
-                        streamformat.format,
-                        streamformat.channels,
-                        streamformat.freq,
-                        _format.format,
-                        _format.channels,
+                        &cvt, streamformat.format, streamformat.channels, streamformat.freq, _format.format, _format.channels,
                         _format.freq)
                     == -1)
                 {
@@ -345,11 +340,7 @@ namespace OpenRCT2::Audio
          * Assumes that srcBuffer is the same format as _format.
          */
         size_t ApplyResample(
-            ISDLAudioChannel* channel,
-            const void* srcBuffer,
-            int32_t srcSamples,
-            int32_t dstSamples,
-            int32_t inRate,
+            ISDLAudioChannel* channel, const void* srcBuffer, int32_t srcSamples, int32_t dstSamples, int32_t inRate,
             int32_t outRate)
         {
             int32_t byteRate = _format.GetByteRate();
diff --git a/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h b/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h
index 46e85df53a..94dc56bb54 100644
--- a/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h
+++ b/src/openrct2-ui/drawing/engines/opengl/OpenGLAPI.h
@@ -92,40 +92,16 @@ typedef void(APIENTRYP PFNGLPIXELSTOREIPROC)(GLenum pname, GLint param);
 typedef void(APIENTRYP PFNGLREADPIXELSPROC)(
     GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels);
 typedef void(APIENTRYP PFNGLTEXIMAGE2DPROC)(
-    GLenum target,
-    GLint level,
-    GLint internalFormat,
-    GLsizei width,
-    GLsizei height,
-    GLint border,
-    GLenum format,
-    GLenum type,
+    GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type,
     const GLvoid* pixels);
 typedef void(APIENTRYP PFNGLTEXPARAMETERIPROC)(GLenum target, GLenum pname, GLint param);
 typedef void(APIENTRYP PFNGLVIEWPORTPROC)(GLint x, GLint y, GLsizei width, GLsizei height);
 typedef void(APIENTRYP PFNGLTEXSUBIMAGE3DPROC)(
-    GLenum target,
-    GLint level,
-    GLint xoffset,
-    GLint yoffset,
-    GLint zoffset,
-    GLsizei width,
-    GLsizei height,
-    GLsizei depth,
-    GLenum format,
-    GLenum type,
-    const GLvoid* data);
+    GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
+    GLenum format, GLenum type, const GLvoid* data);
 typedef void(APIENTRYP PFNGLTEXIMAGE3DPROC)(
-    GLenum target,
-    GLint level,
-    GLint internalFormat,
-    GLsizei width,
-    GLsizei height,
-    GLsizei depth,
-    GLint border,
-    GLenum format,
-    GLenum type,
-    const GLvoid* data);
+    GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format,
+    GLenum type, const GLvoid* data);
 typedef void(APIENTRYP PFNGLGETINTERGERVPROC)(GLenum pname, GLint* data);
 typedef void(APIENTRYP PFNGLGETTEXIMAGEPROC)(GLenum target, GLint level, GLenum format, GLenum type, GLvoid* img);
 
diff --git a/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.cpp b/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.cpp
index 473c94eaee..52133d0222 100644
--- a/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.cpp
+++ b/src/openrct2-ui/drawing/engines/opengl/SwapFramebuffer.cpp
@@ -33,11 +33,8 @@ void SwapFramebuffer::ApplyTransparency(ApplyTransparencyShader& shader, GLuint
     glDisable(GL_DEPTH_TEST);
     shader.Use();
     shader.SetTextures(
-        _opaqueFramebuffer.GetTexture(),
-        _opaqueFramebuffer.GetDepthTexture(),
-        _transparentFramebuffer.GetTexture(),
-        _transparentFramebuffer.GetDepthTexture(),
-        paletteTex);
+        _opaqueFramebuffer.GetTexture(), _opaqueFramebuffer.GetDepthTexture(), _transparentFramebuffer.GetTexture(),
+        _transparentFramebuffer.GetDepthTexture(), paletteTex);
     shader.Draw();
 
     _backDepth = _transparentFramebuffer.SwapDepthTexture(_backDepth);
diff --git a/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp b/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp
index 17ac4496f3..ecc4b6211a 100644
--- a/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp
+++ b/src/openrct2-ui/drawing/engines/opengl/TextureCache.cpp
@@ -178,30 +178,13 @@ void TextureCache::EnlargeAtlasesTexture(GLuint newEntries)
 
     glBindTexture(GL_TEXTURE_2D_ARRAY, _atlasesTexture);
     glTexImage3D(
-        GL_TEXTURE_2D_ARRAY,
-        0,
-        GL_R8UI,
-        _atlasesTextureDimensions,
-        _atlasesTextureDimensions,
-        newIndices,
-        0,
-        GL_RED_INTEGER,
-        GL_UNSIGNED_BYTE,
-        nullptr);
+        GL_TEXTURE_2D_ARRAY, 0, GL_R8UI, _atlasesTextureDimensions, _atlasesTextureDimensions, newIndices, 0, GL_RED_INTEGER,
+        GL_UNSIGNED_BYTE, nullptr);
 
     // Restore old data
     glTexSubImage3D(
-        GL_TEXTURE_2D_ARRAY,
-        0,
-        0,
-        0,
-        0,
-        _atlasesTextureDimensions,
-        _atlasesTextureDimensions,
-        _atlasesTextureIndices,
-        GL_RED_INTEGER,
-        GL_UNSIGNED_BYTE,
-        oldPixels.data());
+        GL_TEXTURE_2D_ARRAY, 0, 0, 0, 0, _atlasesTextureDimensions, _atlasesTextureDimensions, _atlasesTextureIndices,
+        GL_RED_INTEGER, GL_UNSIGNED_BYTE, oldPixels.data());
 
     _atlasesTextureIndices = newIndices;
 }
@@ -215,17 +198,8 @@ AtlasTextureInfo TextureCache::LoadImageTexture(uint32_t image)
 
     glBindTexture(GL_TEXTURE_2D_ARRAY, _atlasesTexture);
     glTexSubImage3D(
-        GL_TEXTURE_2D_ARRAY,
-        0,
-        cacheInfo.bounds.x,
-        cacheInfo.bounds.y,
-        cacheInfo.index,
-        dpi.width,
-        dpi.height,
-        1,
-        GL_RED_INTEGER,
-        GL_UNSIGNED_BYTE,
-        dpi.bits);
+        GL_TEXTURE_2D_ARRAY, 0, cacheInfo.bounds.x, cacheInfo.bounds.y, cacheInfo.index, dpi.width, dpi.height, 1,
+        GL_RED_INTEGER, GL_UNSIGNED_BYTE, dpi.bits);
 
     DeleteDPI(dpi);
 
@@ -241,17 +215,8 @@ AtlasTextureInfo TextureCache::LoadGlyphTexture(uint32_t image, uint8_t* palette
 
     glBindTexture(GL_TEXTURE_2D_ARRAY, _atlasesTexture);
     glTexSubImage3D(
-        GL_TEXTURE_2D_ARRAY,
-        0,
-        cacheInfo.bounds.x,
-        cacheInfo.bounds.y,
-        cacheInfo.index,
-        dpi.width,
-        dpi.height,
-        1,
-        GL_RED_INTEGER,
-        GL_UNSIGNED_BYTE,
-        dpi.bits);
+        GL_TEXTURE_2D_ARRAY, 0, cacheInfo.bounds.x, cacheInfo.bounds.y, cacheInfo.index, dpi.width, dpi.height, 1,
+        GL_RED_INTEGER, GL_UNSIGNED_BYTE, dpi.bits);
 
     DeleteDPI(dpi);
 
diff --git a/src/openrct2-ui/interface/Dropdown.h b/src/openrct2-ui/interface/Dropdown.h
index 7ee1ff3e3d..ff1002826a 100644
--- a/src/openrct2-ui/interface/Dropdown.h
+++ b/src/openrct2-ui/interface/Dropdown.h
@@ -40,24 +40,11 @@ void dropdown_set_disabled(int32_t index, bool value);
 
 void window_dropdown_show_text(int32_t x, int32_t y, int32_t extray, uint8_t colour, uint8_t flags, size_t num_items);
 void window_dropdown_show_text_custom_width(
-    int32_t x,
-    int32_t y,
-    int32_t extray,
-    uint8_t colour,
-    uint8_t custom_height,
-    uint8_t flags,
-    size_t num_items,
+    int32_t x, int32_t y, int32_t extray, uint8_t colour, uint8_t custom_height, uint8_t flags, size_t num_items,
     int32_t width);
 void window_dropdown_show_image(
-    int32_t x,
-    int32_t y,
-    int32_t extray,
-    uint8_t colour,
-    uint8_t flags,
-    int32_t numItems,
-    int32_t itemWidth,
-    int32_t itemHeight,
-    int32_t numColumns);
+    int32_t x, int32_t y, int32_t extray, uint8_t colour, uint8_t flags, int32_t numItems, int32_t itemWidth,
+    int32_t itemHeight, int32_t numColumns);
 void window_dropdown_close();
 int32_t dropdown_index_from_point(int32_t x, int32_t y, rct_window* w);
 void window_dropdown_show_colour(rct_window* w, rct_widget* widget, uint8_t dropdownColour, uint8_t selectedColour);
diff --git a/src/openrct2-ui/interface/Graph.cpp b/src/openrct2-ui/interface/Graph.cpp
index 86d28a08dc..fd625524fe 100644
--- a/src/openrct2-ui/interface/Graph.cpp
+++ b/src/openrct2-ui/interface/Graph.cpp
@@ -127,12 +127,7 @@ static void graph_draw_months_money32(
 }
 
 static void graph_draw_line_a_money32(
-    rct_drawpixelinfo* dpi,
-    const money32* history,
-    int32_t count,
-    int32_t baseX,
-    int32_t baseY,
-    int32_t modifier,
+    rct_drawpixelinfo* dpi, const money32* history, int32_t count, int32_t baseX, int32_t baseY, int32_t modifier,
     int32_t offset)
 {
     int32_t i, x, y, lastX, lastY;
@@ -161,12 +156,7 @@ static void graph_draw_line_a_money32(
 }
 
 static void graph_draw_line_b_money32(
-    rct_drawpixelinfo* dpi,
-    const money32* history,
-    int32_t count,
-    int32_t baseX,
-    int32_t baseY,
-    int32_t modifier,
+    rct_drawpixelinfo* dpi, const money32* history, int32_t count, int32_t baseX, int32_t baseY, int32_t modifier,
     int32_t offset)
 {
     int32_t i, x, y, lastX, lastY;
diff --git a/src/openrct2-ui/interface/InGameConsole.cpp b/src/openrct2-ui/interface/InGameConsole.cpp
index c9d18dd7c6..2740580fe6 100644
--- a/src/openrct2-ui/interface/InGameConsole.cpp
+++ b/src/openrct2-ui/interface/InGameConsole.cpp
@@ -298,12 +298,7 @@ void InGameConsole::Draw(rct_drawpixelinfo* dpi) const
     gfx_fill_rect_inset(
         dpi, _consoleLeft, _consoleTop, _consoleRight, _consoleBottom, backgroundColour, INSET_RECT_FLAG_FILL_NONE);
     gfx_fill_rect_inset(
-        dpi,
-        _consoleLeft + 1,
-        _consoleTop + 1,
-        _consoleRight - 1,
-        _consoleBottom - 1,
-        backgroundColour,
+        dpi, _consoleLeft + 1, _consoleTop + 1, _consoleRight - 1, _consoleBottom - 1, backgroundColour,
         INSET_RECT_FLAG_BORDER_INSET);
 
     std::string lineBuffer;
diff --git a/src/openrct2-ui/interface/LandTool.cpp b/src/openrct2-ui/interface/LandTool.cpp
index 3ac0a44875..e030700a39 100644
--- a/src/openrct2-ui/interface/LandTool.cpp
+++ b/src/openrct2-ui/interface/LandTool.cpp
@@ -99,14 +99,7 @@ void land_tool_show_surface_style_dropdown(rct_window* w, rct_widget* widget, ui
     }
 
     window_dropdown_show_image(
-        w->x + widget->left,
-        w->y + widget->top,
-        widget->bottom - widget->top,
-        w->colours[2],
-        0,
-        TERRAIN_COUNT_REGULAR,
-        47,
-        36,
+        w->x + widget->left, w->y + widget->top, widget->bottom - widget->top, w->colours[2], 0, TERRAIN_COUNT_REGULAR, 47, 36,
         gAppropriateImageDropdownItemsPerRow[TERRAIN_COUNT_REGULAR]);
 
     gDropdownDefaultIndex = defaultIndex;
@@ -127,14 +120,7 @@ void land_tool_show_edge_style_dropdown(rct_window* w, rct_widget* widget, uint8
     }
 
     window_dropdown_show_image(
-        w->x + widget->left,
-        w->y + widget->top,
-        widget->bottom - widget->top,
-        w->colours[2],
-        0,
-        edgeCount,
-        47,
-        36,
+        w->x + widget->left, w->y + widget->top, widget->bottom - widget->top, w->colours[2], 0, edgeCount, 47, 36,
         gAppropriateImageDropdownItemsPerRow[edgeCount]);
 
     gDropdownDefaultIndex = defaultIndex;
diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp
index dfe4c4a23a..2c8cdb7ab5 100644
--- a/src/openrct2-ui/interface/ViewportInteraction.cpp
+++ b/src/openrct2-ui/interface/ViewportInteraction.cpp
@@ -61,14 +61,8 @@ int32_t viewport_interaction_get_item_left(int32_t x, int32_t y, viewport_intera
 
     LocationXY16 mapCoord = {};
     get_map_coordinates_from_pos(
-        x,
-        y,
-        VIEWPORT_INTERACTION_MASK_SPRITE & VIEWPORT_INTERACTION_MASK_RIDE & VIEWPORT_INTERACTION_MASK_PARK,
-        &mapCoord.x,
-        &mapCoord.y,
-        &info->type,
-        &info->tileElement,
-        nullptr);
+        x, y, VIEWPORT_INTERACTION_MASK_SPRITE & VIEWPORT_INTERACTION_MASK_RIDE & VIEWPORT_INTERACTION_MASK_PARK, &mapCoord.x,
+        &mapCoord.y, &info->type, &info->tileElement, nullptr);
     info->x = mapCoord.x;
     info->y = mapCoord.y;
     tileElement = info->tileElement;
@@ -164,13 +158,8 @@ int32_t viewport_interaction_left_click(int32_t x, int32_t y)
                         {
                             case SPRITE_MISC_BALLOON:
                                 game_do_command(
-                                    info.sprite->balloon.sprite_index,
-                                    GAME_COMMAND_FLAG_APPLY,
-                                    0,
-                                    0,
-                                    GAME_COMMAND_BALLOON_PRESS,
-                                    0,
-                                    0);
+                                    info.sprite->balloon.sprite_index, GAME_COMMAND_FLAG_APPLY, 0, 0,
+                                    GAME_COMMAND_BALLOON_PRESS, 0, 0);
                                 break;
                             case SPRITE_MISC_DUCK:
                                 duck_press(&info.sprite->duck);
@@ -217,14 +206,8 @@ int32_t viewport_interaction_get_item_right(int32_t x, int32_t y, viewport_inter
 
     LocationXY16 mapCoord = {};
     get_map_coordinates_from_pos(
-        x,
-        y,
-        ~(VIEWPORT_INTERACTION_MASK_TERRAIN & VIEWPORT_INTERACTION_MASK_WATER),
-        &mapCoord.x,
-        &mapCoord.y,
-        &info->type,
-        &info->tileElement,
-        nullptr);
+        x, y, ~(VIEWPORT_INTERACTION_MASK_TERRAIN & VIEWPORT_INTERACTION_MASK_WATER), &mapCoord.x, &mapCoord.y, &info->type,
+        &info->tileElement, nullptr);
     info->x = mapCoord.x;
     info->y = mapCoord.y;
     tileElement = info->tileElement;
@@ -480,13 +463,8 @@ static void viewport_interaction_remove_scenery(rct_tile_element* tileElement, i
 {
     gGameCommandErrorTitle = STR_CANT_REMOVE_THIS;
     game_do_command(
-        x,
-        (tileElement->type << 8) | 1,
-        y,
-        (tileElement->properties.scenery.type << 8) | tileElement->base_height,
-        GAME_COMMAND_REMOVE_SCENERY,
-        0,
-        0);
+        x, (tileElement->type << 8) | 1, y, (tileElement->properties.scenery.type << 8) | tileElement->base_height,
+        GAME_COMMAND_REMOVE_SCENERY, 0, 0);
 }
 
 /**
@@ -531,13 +509,8 @@ static void viewport_interaction_remove_footpath_item(rct_tile_element* tileElem
 
     gGameCommandErrorTitle = STR_CANT_REMOVE_THIS;
     game_do_command(
-        x,
-        ((tileElement->properties.path.type & 7) << 8) | 1,
-        y,
-        (type << 8) | tileElement->base_height,
-        GAME_COMMAND_PLACE_PATH,
-        0,
-        0);
+        x, ((tileElement->properties.path.type & 7) << 8) | 1, y, (type << 8) | tileElement->base_height,
+        GAME_COMMAND_PLACE_PATH, 0, 0);
 }
 
 /**
@@ -598,13 +571,8 @@ static void viewport_interaction_remove_large_scenery(rct_tile_element* tileElem
     {
         gGameCommandErrorTitle = STR_CANT_REMOVE_THIS;
         game_do_command(
-            x,
-            1 | (tile_element_get_direction(tileElement) << 8),
-            y,
-            tileElement->base_height | (scenery_large_get_sequence(tileElement) << 8),
-            GAME_COMMAND_REMOVE_LARGE_SCENERY,
-            0,
-            0);
+            x, 1 | (tile_element_get_direction(tileElement) << 8), y,
+            tileElement->base_height | (scenery_large_get_sequence(tileElement) << 8), GAME_COMMAND_REMOVE_LARGE_SCENERY, 0, 0);
     }
 }
 
@@ -660,14 +628,8 @@ void sub_68A15E(int32_t screenX, int32_t screenY, int16_t* x, int16_t* y, int32_
     rct_tile_element* myTileElement;
     rct_viewport* viewport;
     get_map_coordinates_from_pos(
-        screenX,
-        screenY,
-        VIEWPORT_INTERACTION_MASK_TERRAIN & VIEWPORT_INTERACTION_MASK_WATER,
-        &my_x,
-        &my_y,
-        &interactionType,
-        &myTileElement,
-        &viewport);
+        screenX, screenY, VIEWPORT_INTERACTION_MASK_TERRAIN & VIEWPORT_INTERACTION_MASK_WATER, &my_x, &my_y, &interactionType,
+        &myTileElement, &viewport);
 
     if (interactionType == VIEWPORT_INTERACTION_ITEM_NONE)
     {
diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp
index 1b07e28661..0f36420d7c 100644
--- a/src/openrct2-ui/interface/Widget.cpp
+++ b/src/openrct2-ui/interface/Widget.cpp
@@ -702,12 +702,7 @@ static void widget_hscrollbar_draw(
 
     // Thumb
     gfx_fill_rect_inset(
-        dpi,
-        std::max(l + 10, l + scroll->h_thumb_left - 1),
-        t,
-        std::min(r - 10, l + scroll->h_thumb_right - 1),
-        b,
-        colour,
+        dpi, std::max(l + 10, l + scroll->h_thumb_left - 1), t, std::min(r - 10, l + scroll->h_thumb_right - 1), b, colour,
         ((scroll->flags & HSCROLLBAR_THUMB_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0));
 
     // Right button
@@ -735,12 +730,7 @@ static void widget_vscrollbar_draw(
 
     // Thumb
     gfx_fill_rect_inset(
-        dpi,
-        l,
-        std::max(t + 10, t + scroll->v_thumb_top - 1),
-        r,
-        std::min(b - 10, t + scroll->v_thumb_bottom - 1),
-        colour,
+        dpi, l, std::max(t + 10, t + scroll->v_thumb_top - 1), r, std::min(b - 10, t + scroll->v_thumb_bottom - 1), colour,
         ((scroll->flags & VSCROLLBAR_THUMB_PRESSED) ? INSET_RECT_FLAG_BORDER_INSET : 0));
 
     // Down button
@@ -869,13 +859,7 @@ bool widget_is_active_tool(rct_window* w, rct_widgetindex widgetIndex)
  *  edi: widget
  */
 void widget_scroll_get_part(
-    rct_window* w,
-    rct_widget* widget,
-    int32_t x,
-    int32_t y,
-    int32_t* output_x,
-    int32_t* output_y,
-    int32_t* output_scroll_area,
+    rct_window* w, rct_widget* widget, int32_t x, int32_t y, int32_t* output_x, int32_t* output_y, int32_t* output_scroll_area,
     int32_t* scroll_id)
 {
     rct_widget* iterator = w->widgets;
diff --git a/src/openrct2-ui/interface/Window.cpp b/src/openrct2-ui/interface/Window.cpp
index d58239a2ca..23d5e64be5 100644
--- a/src/openrct2-ui/interface/Window.cpp
+++ b/src/openrct2-ui/interface/Window.cpp
@@ -85,12 +85,7 @@ static bool window_fits_on_screen(int32_t x, int32_t y, int32_t width, int32_t h
 }
 
 rct_window* window_create(
-    int32_t x,
-    int32_t y,
-    int32_t width,
-    int32_t height,
-    rct_window_event_list* event_handlers,
-    rct_windowclass cls,
+    int32_t x, int32_t y, int32_t width, int32_t height, rct_window_event_list* event_handlers, rct_windowclass cls,
     uint16_t flags)
 {
     // Check if there are any window slots left
diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp
index 2e5589cf49..a42f252960 100644
--- a/src/openrct2-ui/windows/Banner.cpp
+++ b/src/openrct2-ui/windows/Banner.cpp
@@ -152,17 +152,8 @@ rct_window* window_banner_open(rct_windownumber number)
     // Create viewport
     viewportWidget = &window_banner_widgets[WIDX_VIEWPORT];
     viewport_create(
-        w,
-        w->x + viewportWidget->left + 1,
-        w->y + viewportWidget->top + 1,
-        (viewportWidget->right - viewportWidget->left) - 2,
-        (viewportWidget->bottom - viewportWidget->top) - 2,
-        0,
-        view_x,
-        view_y,
-        view_z,
-        0,
-        -1);
+        w, w->x + viewportWidget->left + 1, w->y + viewportWidget->top + 1, (viewportWidget->right - viewportWidget->left) - 2,
+        (viewportWidget->bottom - viewportWidget->top) - 2, 0, view_x, view_y, view_z, 0, -1);
 
     w->viewport->flags = gConfigGeneral.always_show_gridlines ? VIEWPORT_FLAG_GRIDLINES : 0;
     window_invalidate(w);
@@ -196,13 +187,8 @@ static void window_banner_mouseup(rct_window* w, rct_widgetindex widgetIndex)
             break;
         case WIDX_BANNER_DEMOLISH:
             game_do_command(
-                x,
-                1,
-                y,
-                tile_element->base_height | (tile_element->properties.banner.position << 8),
-                GAME_COMMAND_REMOVE_BANNER,
-                0,
-                0);
+                x, 1, y, tile_element->base_height | (tile_element->properties.banner.position << 8),
+                GAME_COMMAND_REMOVE_BANNER, 0, 0);
             break;
         case WIDX_BANNER_TEXT:
             window_text_input_open(
@@ -211,12 +197,7 @@ static void window_banner_mouseup(rct_window* w, rct_widgetindex widgetIndex)
         case WIDX_BANNER_NO_ENTRY:
             textinput_cancel();
             game_do_command(
-                1,
-                GAME_COMMAND_FLAG_APPLY,
-                w->number,
-                banner->colour,
-                GAME_COMMAND_SET_BANNER_STYLE,
-                banner->text_colour,
+                1, GAME_COMMAND_FLAG_APPLY, w->number, banner->colour, GAME_COMMAND_SET_BANNER_STYLE, banner->text_colour,
                 banner->flags ^ BANNER_FLAG_NO_ENTRY);
             break;
     }
@@ -247,14 +228,8 @@ static void window_banner_mousedown(rct_window* w, rct_widgetindex widgetIndex,
             widget--;
 
             window_dropdown_show_text_custom_width(
-                widget->left + w->x,
-                widget->top + w->y,
-                widget->bottom - widget->top + 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                13,
-                widget->right - widget->left - 3);
+                widget->left + w->x, widget->top + w->y, widget->bottom - widget->top + 1, w->colours[1], 0,
+                DROPDOWN_FLAG_STAY_OPEN, 13, widget->right - widget->left - 3);
 
             dropdown_set_checked(banner->text_colour - 1, true);
             break;
@@ -276,12 +251,7 @@ static void window_banner_dropdown(rct_window* w, rct_widgetindex widgetIndex, i
                 break;
 
             game_do_command(
-                1,
-                GAME_COMMAND_FLAG_APPLY,
-                w->number,
-                dropdownIndex,
-                GAME_COMMAND_SET_BANNER_STYLE,
-                banner->text_colour,
+                1, GAME_COMMAND_FLAG_APPLY, w->number, dropdownIndex, GAME_COMMAND_SET_BANNER_STYLE, banner->text_colour,
                 banner->flags);
             break;
         case WIDX_TEXT_COLOUR_DROPDOWN_BUTTON:
@@ -289,12 +259,7 @@ static void window_banner_dropdown(rct_window* w, rct_widgetindex widgetIndex, i
                 break;
 
             game_do_command(
-                1,
-                GAME_COMMAND_FLAG_APPLY,
-                w->number,
-                banner->colour,
-                GAME_COMMAND_SET_BANNER_STYLE,
-                dropdownIndex + 1,
+                1, GAME_COMMAND_FLAG_APPLY, w->number, banner->colour, GAME_COMMAND_SET_BANNER_STYLE, dropdownIndex + 1,
                 banner->flags);
             break;
     }
@@ -379,17 +344,8 @@ static void window_banner_viewport_rotate(rct_window* w)
     // Create viewport
     rct_widget* viewportWidget = &window_banner_widgets[WIDX_VIEWPORT];
     viewport_create(
-        w,
-        w->x + viewportWidget->left + 1,
-        w->y + viewportWidget->top + 1,
-        (viewportWidget->right - viewportWidget->left) - 1,
-        (viewportWidget->bottom - viewportWidget->top) - 1,
-        0,
-        view_x,
-        view_y,
-        view_z,
-        0,
-        -1);
+        w, w->x + viewportWidget->left + 1, w->y + viewportWidget->top + 1, (viewportWidget->right - viewportWidget->left) - 1,
+        (viewportWidget->bottom - viewportWidget->top) - 1, 0, view_x, view_y, view_z, 0, -1);
 
     w->viewport->flags = gConfigGeneral.always_show_gridlines ? VIEWPORT_FLAG_GRIDLINES : 0;
     window_invalidate(w);
diff --git a/src/openrct2-ui/windows/Cheats.cpp b/src/openrct2-ui/windows/Cheats.cpp
index a4f350e69a..86e1535904 100644
--- a/src/openrct2-ui/windows/Cheats.cpp
+++ b/src/openrct2-ui/windows/Cheats.cpp
@@ -718,14 +718,8 @@ static void window_cheats_misc_mousedown(rct_window* w, rct_widgetindex widgetIn
                 gDropdownItemsArgs[i] = WeatherTypes[i];
             }
             window_dropdown_show_text_custom_width(
-                w->x + dropdownWidget->left,
-                w->y + dropdownWidget->top,
-                dropdownWidget->bottom - dropdownWidget->top + 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                6,
-                dropdownWidget->right - dropdownWidget->left - 3);
+                w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+                w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, 6, dropdownWidget->right - dropdownWidget->left - 3);
 
             currentWeather = gClimateCurrent.Weather;
             dropdown_set_checked(currentWeather, true);
@@ -744,14 +738,8 @@ static void window_cheats_misc_mousedown(rct_window* w, rct_widgetindex widgetIn
             }
 
             window_dropdown_show_text_custom_width(
-                w->x + dropdownWidget->left,
-                w->y + dropdownWidget->top,
-                dropdownWidget->bottom - dropdownWidget->top + 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                3,
-                dropdownWidget->right - dropdownWidget->left - 3);
+                w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+                w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, 3, dropdownWidget->right - dropdownWidget->left - 3);
             dropdown_set_checked(_selectedStaffSpeed, true);
         }
     }
@@ -830,13 +818,8 @@ static void window_cheats_guests_mouseup(rct_window* w, rct_widgetindex widgetIn
             break;
         case WIDX_GUEST_HAPPINESS_MAX:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                CHEAT_SETGUESTPARAMETER,
-                GUEST_PARAMETER_HAPPINESS,
-                GAME_COMMAND_CHEAT,
-                PEEP_MAX_HAPPINESS,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_HAPPINESS, GAME_COMMAND_CHEAT,
+                PEEP_MAX_HAPPINESS, 0);
             break;
         case WIDX_GUEST_HAPPINESS_MIN:
             game_do_command(
@@ -844,23 +827,13 @@ static void window_cheats_guests_mouseup(rct_window* w, rct_widgetindex widgetIn
             break;
         case WIDX_GUEST_ENERGY_MAX:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                CHEAT_SETGUESTPARAMETER,
-                GUEST_PARAMETER_ENERGY,
-                GAME_COMMAND_CHEAT,
-                PEEP_MAX_ENERGY,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_ENERGY, GAME_COMMAND_CHEAT,
+                PEEP_MAX_ENERGY, 0);
             break;
         case WIDX_GUEST_ENERGY_MIN:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                CHEAT_SETGUESTPARAMETER,
-                GUEST_PARAMETER_ENERGY,
-                GAME_COMMAND_CHEAT,
-                PEEP_MIN_ENERGY,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_ENERGY, GAME_COMMAND_CHEAT,
+                PEEP_MIN_ENERGY, 0);
             break;
         case WIDX_GUEST_HUNGER_MAX:
             game_do_command(
@@ -888,23 +861,13 @@ static void window_cheats_guests_mouseup(rct_window* w, rct_widgetindex widgetIn
             break;
         case WIDX_GUEST_NAUSEA_TOLERANCE_MAX:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                CHEAT_SETGUESTPARAMETER,
-                GUEST_PARAMETER_NAUSEA_TOLERANCE,
-                GAME_COMMAND_CHEAT,
-                PEEP_NAUSEA_TOLERANCE_HIGH,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_NAUSEA_TOLERANCE, GAME_COMMAND_CHEAT,
+                PEEP_NAUSEA_TOLERANCE_HIGH, 0);
             break;
         case WIDX_GUEST_NAUSEA_TOLERANCE_MIN:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                CHEAT_SETGUESTPARAMETER,
-                GUEST_PARAMETER_NAUSEA_TOLERANCE,
-                GAME_COMMAND_CHEAT,
-                PEEP_NAUSEA_TOLERANCE_NONE,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_NAUSEA_TOLERANCE, GAME_COMMAND_CHEAT,
+                PEEP_NAUSEA_TOLERANCE_NONE, 0);
             break;
         case WIDX_GUEST_BATHROOM_MAX:
             game_do_command(
@@ -916,23 +879,13 @@ static void window_cheats_guests_mouseup(rct_window* w, rct_widgetindex widgetIn
             break;
         case WIDX_GUEST_RIDE_INTENSITY_MORE_THAN_1:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                CHEAT_SETGUESTPARAMETER,
-                GUEST_PARAMETER_PREFERRED_RIDE_INTENSITY,
-                GAME_COMMAND_CHEAT,
-                1,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_PREFERRED_RIDE_INTENSITY,
+                GAME_COMMAND_CHEAT, 1, 0);
             break;
         case WIDX_GUEST_RIDE_INTENSITY_LESS_THAN_15:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                CHEAT_SETGUESTPARAMETER,
-                GUEST_PARAMETER_PREFERRED_RIDE_INTENSITY,
-                GAME_COMMAND_CHEAT,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, CHEAT_SETGUESTPARAMETER, GUEST_PARAMETER_PREFERRED_RIDE_INTENSITY,
+                GAME_COMMAND_CHEAT, 0, 0);
             break;
         case WIDX_TRAM_GUESTS:
             game_do_command(0, GAME_COMMAND_FLAG_APPLY, CHEAT_GENERATEGUESTS, CHEATS_TRAM_INCREMENT, GAME_COMMAND_CHEAT, 0, 0);
@@ -1091,12 +1044,7 @@ static void window_cheats_rides_mouseup(rct_window* w, rct_widgetindex widgetInd
             break;
         case WIDX_SHOW_ALL_OPERATING_MODES:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                CHEAT_SHOWALLOPERATINGMODES,
-                !gCheatsShowAllOperatingModes,
-                GAME_COMMAND_CHEAT,
-                0,
+                0, GAME_COMMAND_FLAG_APPLY, CHEAT_SHOWALLOPERATINGMODES, !gCheatsShowAllOperatingModes, GAME_COMMAND_CHEAT, 0,
                 0);
             if (gCheatsShowAllOperatingModes)
             {
@@ -1105,13 +1053,8 @@ static void window_cheats_rides_mouseup(rct_window* w, rct_widgetindex widgetInd
             break;
         case WIDX_SHOW_VEHICLES_FROM_OTHER_TRACK_TYPES:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                CHEAT_SHOWVEHICLESFROMOTHERTRACKTYPES,
-                !gCheatsShowVehiclesFromOtherTrackTypes,
-                GAME_COMMAND_CHEAT,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, CHEAT_SHOWVEHICLESFROMOTHERTRACKTYPES, !gCheatsShowVehiclesFromOtherTrackTypes,
+                GAME_COMMAND_CHEAT, 0, 0);
             if (gCheatsShowVehiclesFromOtherTrackTypes)
             {
                 context_show_error(STR_WARNING_IN_CAPS, STR_THIS_FEATURE_IS_CURRENTLY_UNSTABLE);
@@ -1119,13 +1062,8 @@ static void window_cheats_rides_mouseup(rct_window* w, rct_widgetindex widgetInd
             break;
         case WIDX_DISABLE_TRAIN_LENGTH_LIMITS:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                CHEAT_DISABLETRAINLENGTHLIMIT,
-                !gCheatsDisableTrainLengthLimit,
-                GAME_COMMAND_CHEAT,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, CHEAT_DISABLETRAINLENGTHLIMIT, !gCheatsDisableTrainLengthLimit, GAME_COMMAND_CHEAT,
+                0, 0);
             if (gCheatsDisableTrainLengthLimit)
             {
                 context_show_error(STR_WARNING_IN_CAPS, STR_THIS_FEATURE_IS_CURRENTLY_UNSTABLE);
@@ -1133,23 +1071,13 @@ static void window_cheats_rides_mouseup(rct_window* w, rct_widgetindex widgetInd
             break;
         case WIDX_ENABLE_CHAIN_LIFT_ON_ALL_TRACK:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                CHEAT_ENABLECHAINLIFTONALLTRACK,
-                !gCheatsEnableChainLiftOnAllTrack,
-                GAME_COMMAND_CHEAT,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, CHEAT_ENABLECHAINLIFTONALLTRACK, !gCheatsEnableChainLiftOnAllTrack,
+                GAME_COMMAND_CHEAT, 0, 0);
             break;
         case WIDX_ENABLE_ARBITRARY_RIDE_TYPE_CHANGES:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                CHEAT_ALLOW_ARBITRARY_RIDE_TYPE_CHANGES,
-                !gCheatsAllowArbitraryRideTypeChanges,
-                GAME_COMMAND_CHEAT,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, CHEAT_ALLOW_ARBITRARY_RIDE_TYPE_CHANGES, !gCheatsAllowArbitraryRideTypeChanges,
+                GAME_COMMAND_CHEAT, 0, 0);
             if (gCheatsAllowArbitraryRideTypeChanges)
             {
                 context_show_error(STR_WARNING_IN_CAPS, STR_THIS_FEATURE_IS_CURRENTLY_UNSTABLE);
@@ -1157,12 +1085,7 @@ static void window_cheats_rides_mouseup(rct_window* w, rct_widgetindex widgetInd
             break;
         case WIDX_DISABLE_RIDE_VALUE_AGING:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                CHEAT_DISABLERIDEVALUEAGING,
-                !gCheatsDisableRideValueAging,
-                GAME_COMMAND_CHEAT,
-                0,
+                0, GAME_COMMAND_FLAG_APPLY, CHEAT_DISABLERIDEVALUEAGING, !gCheatsDisableRideValueAging, GAME_COMMAND_CHEAT, 0,
                 0);
             break;
         case WIDX_IGNORE_RESEARCH_STATUS:
@@ -1171,13 +1094,8 @@ static void window_cheats_rides_mouseup(rct_window* w, rct_widgetindex widgetInd
             break;
         case WIDX_ENABLE_ALL_DRAWABLE_TRACK_PIECES:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                CHEAT_ENABLEALLDRAWABLETRACKPIECES,
-                !gCheatsEnableAllDrawableTrackPieces,
-                GAME_COMMAND_CHEAT,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, CHEAT_ENABLEALLDRAWABLETRACKPIECES, !gCheatsEnableAllDrawableTrackPieces,
+                GAME_COMMAND_CHEAT, 0, 0);
             break;
     }
 }
@@ -1314,11 +1232,7 @@ static void window_cheats_paint(rct_window* w, rct_drawpixelinfo* dpi)
         gfx_draw_string_left(dpi, STR_CHEAT_STAFF_SPEED, nullptr, COLOUR_BLACK, w->x + XPL(0) + TXTO, w->y + YPL(17) + TXTO);
         gfx_draw_string_left(dpi, STR_FORCE_WEATHER, nullptr, COLOUR_BLACK, w->x + XPL(0) + TXTO, w->y + YPL(10) + TXTO);
         gfx_draw_string_right(
-            dpi,
-            STR_FORMAT_INTEGER,
-            &park_rating_spinner_value,
-            w->colours[1],
-            w->x + WPL(1) - 34 - TXTO,
+            dpi, STR_FORMAT_INTEGER, &park_rating_spinner_value, w->colours[1], w->x + WPL(1) - 34 - TXTO,
             w->y + YPL(5) + TXTO);
     }
     else if (w->page == WINDOW_CHEATS_PAGE_GUESTS)
diff --git a/src/openrct2-ui/windows/CustomCurrency.cpp b/src/openrct2-ui/windows/CustomCurrency.cpp
index 1fc51fe9c8..9899710761 100644
--- a/src/openrct2-ui/windows/CustomCurrency.cpp
+++ b/src/openrct2-ui/windows/CustomCurrency.cpp
@@ -138,14 +138,8 @@ static void custom_currency_window_mousedown(rct_window* w, rct_widgetindex widg
             gDropdownItemsArgs[1] = STR_SUFFIX;
 
             window_dropdown_show_text_custom_width(
-                w->x + widget->left,
-                w->y + widget->top,
-                widget->bottom - widget->top + 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                2,
-                widget->right - widget->left - 3);
+                w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0,
+                DROPDOWN_FLAG_STAY_OPEN, 2, widget->right - widget->left - 3);
 
             if (CurrencyDescriptors[CURRENCY_CUSTOM].affix_unicode == CURRENCY_PREFIX)
             {
@@ -160,12 +154,8 @@ static void custom_currency_window_mousedown(rct_window* w, rct_widgetindex widg
 
         case WIDX_SYMBOL_TEXT:
             window_text_input_raw_open(
-                w,
-                WIDX_SYMBOL_TEXT,
-                STR_CUSTOM_CURRENCY_SYMBOL_INPUT_TITLE,
-                STR_CUSTOM_CURRENCY_SYMBOL_INPUT_DESC,
-                CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode,
-                CURRENCY_SYMBOL_MAX_SIZE);
+                w, WIDX_SYMBOL_TEXT, STR_CUSTOM_CURRENCY_SYMBOL_INPUT_TITLE, STR_CUSTOM_CURRENCY_SYMBOL_INPUT_DESC,
+                CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode, CURRENCY_SYMBOL_MAX_SIZE);
             break;
     }
 }
@@ -176,13 +166,8 @@ static void custom_currency_window_mouseup(rct_window* w, rct_widgetindex widget
     {
         case WIDX_RATE:
             window_text_input_open(
-                w,
-                WIDX_RATE,
-                STR_RATE_INPUT_TITLE,
-                STR_RATE_INPUT_DESC,
-                STR_FORMAT_INTEGER,
-                (uint32_t)CurrencyDescriptors[CURRENCY_CUSTOM].rate,
-                CURRENCY_RATE_MAX_NUM_DIGITS);
+                w, WIDX_RATE, STR_RATE_INPUT_TITLE, STR_RATE_INPUT_DESC, STR_FORMAT_INTEGER,
+                (uint32_t)CurrencyDescriptors[CURRENCY_CUSTOM].rate, CURRENCY_RATE_MAX_NUM_DIGITS);
             break;
     }
 }
@@ -224,8 +209,7 @@ static void custom_currency_window_text_input([[maybe_unused]] struct rct_window
             safe_strcpy(CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode, text, CURRENCY_SYMBOL_MAX_SIZE);
 
             safe_strcpy(
-                gConfigGeneral.custom_currency_symbol,
-                CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode,
+                gConfigGeneral.custom_currency_symbol, CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode,
                 CURRENCY_SYMBOL_MAX_SIZE);
 
             config_save_default();
@@ -267,30 +251,20 @@ static void custom_currency_window_paint(rct_window* w, rct_drawpixelinfo* dpi)
     gfx_draw_string_left(dpi, STR_CURRENCY_SYMBOL_TEXT, nullptr, w->colours[1], x, y);
 
     gfx_draw_string(
-        dpi,
-        CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode,
-        w->colours[1],
+        dpi, CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode, w->colours[1],
         w->x + window_custom_currency_widgets[WIDX_SYMBOL_TEXT].left + 1,
         w->y + window_custom_currency_widgets[WIDX_SYMBOL_TEXT].top);
 
     if (CurrencyDescriptors[CURRENCY_CUSTOM].affix_unicode == CURRENCY_PREFIX)
     {
         gfx_draw_string_left(
-            dpi,
-            STR_PREFIX,
-            w,
-            w->colours[1],
-            w->x + window_custom_currency_widgets[WIDX_AFFIX_DROPDOWN].left + 1,
+            dpi, STR_PREFIX, w, w->colours[1], w->x + window_custom_currency_widgets[WIDX_AFFIX_DROPDOWN].left + 1,
             w->y + window_custom_currency_widgets[WIDX_AFFIX_DROPDOWN].top);
     }
     else
     {
         gfx_draw_string_left(
-            dpi,
-            STR_SUFFIX,
-            w,
-            w->colours[1],
-            w->x + window_custom_currency_widgets[WIDX_AFFIX_DROPDOWN].left + 1,
+            dpi, STR_SUFFIX, w, w->colours[1], w->x + window_custom_currency_widgets[WIDX_AFFIX_DROPDOWN].left + 1,
             w->y + window_custom_currency_widgets[WIDX_AFFIX_DROPDOWN].top);
     }
 }
diff --git a/src/openrct2-ui/windows/DebugPaint.cpp b/src/openrct2-ui/windows/DebugPaint.cpp
index 5948de688d..570ae1e26c 100644
--- a/src/openrct2-ui/windows/DebugPaint.cpp
+++ b/src/openrct2-ui/windows/DebugPaint.cpp
@@ -90,13 +90,8 @@ rct_window* window_debug_paint_open()
         return window;
 
     window = window_create(
-        16,
-        context_get_height() - 16 - 33 - WINDOW_HEIGHT,
-        WINDOW_WIDTH,
-        WINDOW_HEIGHT,
-        &window_debug_paint_events,
-        WC_DEBUG_PAINT,
-        WF_STICK_TO_FRONT | WF_TRANSPARENT);
+        16, context_get_height() - 16 - 33 - WINDOW_HEIGHT, WINDOW_WIDTH, WINDOW_HEIGHT, &window_debug_paint_events,
+        WC_DEBUG_PAINT, WF_STICK_TO_FRONT | WF_TRANSPARENT);
 
     window->widgets = window_debug_paint_widgets;
     window->enabled_widgets = (1 << WIDX_TOGGLE_SHOW_WIDE_PATHS) | (1 << WIDX_TOGGLE_SHOW_BLOCKED_TILES)
diff --git a/src/openrct2-ui/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp
index b300a18536..4192fce246 100644
--- a/src/openrct2-ui/windows/Dropdown.cpp
+++ b/src/openrct2-ui/windows/Dropdown.cpp
@@ -207,13 +207,8 @@ void window_dropdown_show_text_custom_width(
 
     // Create the window
     w = window_create(
-        x,
-        y + extray,
-        window_dropdown_widgets[WIDX_BACKGROUND].right + 1,
-        window_dropdown_widgets[WIDX_BACKGROUND].bottom + 1,
-        &window_dropdown_events,
-        WC_DROPDOWN,
-        WF_STICK_TO_FRONT);
+        x, y + extray, window_dropdown_widgets[WIDX_BACKGROUND].right + 1, window_dropdown_widgets[WIDX_BACKGROUND].bottom + 1,
+        &window_dropdown_events, WC_DROPDOWN, WF_STICK_TO_FRONT);
     w->widgets = window_dropdown_widgets;
     if (colour & COLOUR_FLAG_TRANSLUCENT)
         w->flags |= WF_TRANSPARENT;
@@ -243,15 +238,8 @@ void window_dropdown_show_text_custom_width(
  * @param numColumns (bl)
  */
 void window_dropdown_show_image(
-    int32_t x,
-    int32_t y,
-    int32_t extray,
-    uint8_t colour,
-    uint8_t flags,
-    int32_t numItems,
-    int32_t itemWidth,
-    int32_t itemHeight,
-    int32_t numColumns)
+    int32_t x, int32_t y, int32_t extray, uint8_t colour, uint8_t flags, int32_t numItems, int32_t itemWidth,
+    int32_t itemHeight, int32_t numColumns)
 {
     int32_t width, height;
     rct_window* w;
@@ -299,13 +287,8 @@ void window_dropdown_show_image(
 
     // Create the window
     w = window_create(
-        x,
-        y + extray,
-        window_dropdown_widgets[WIDX_BACKGROUND].right + 1,
-        window_dropdown_widgets[WIDX_BACKGROUND].bottom + 1,
-        &window_dropdown_events,
-        WC_DROPDOWN,
-        WF_STICK_TO_FRONT);
+        x, y + extray, window_dropdown_widgets[WIDX_BACKGROUND].right + 1, window_dropdown_widgets[WIDX_BACKGROUND].bottom + 1,
+        &window_dropdown_events, WC_DROPDOWN, WF_STICK_TO_FRONT);
     w->widgets = window_dropdown_widgets;
     if (colour & COLOUR_FLAG_TRANSLUCENT)
         w->flags |= WF_TRANSPARENT;
@@ -409,13 +392,8 @@ static void window_dropdown_paint(rct_window* w, rct_drawpixelinfo* dpi)
 
                 // Draw item string
                 gfx_draw_string_left_clipped(
-                    dpi,
-                    item,
-                    (void*)(&gDropdownItemsArgs[i]),
-                    colour,
-                    w->x + 2 + (cell_x * _dropdown_item_width),
-                    w->y + 2 + (cell_y * _dropdown_item_height),
-                    w->width - 5);
+                    dpi, item, (void*)(&gDropdownItemsArgs[i]), colour, w->x + 2 + (cell_x * _dropdown_item_width),
+                    w->y + 2 + (cell_y * _dropdown_item_height), w->width - 5);
             }
         }
     }
@@ -476,15 +454,8 @@ void window_dropdown_show_colour(rct_window* w, rct_widget* widget, uint8_t drop
 
     // Show dropdown
     window_dropdown_show_image(
-        w->x + widget->left,
-        w->y + widget->top,
-        widget->bottom - widget->top + 1,
-        dropdownColour,
-        DROPDOWN_FLAG_STAY_OPEN,
-        COLOUR_COUNT,
-        12,
-        12,
-        gAppropriateImageDropdownItemsPerRow[COLOUR_COUNT]);
+        w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, dropdownColour, DROPDOWN_FLAG_STAY_OPEN,
+        COLOUR_COUNT, 12, 12, gAppropriateImageDropdownItemsPerRow[COLOUR_COUNT]);
 
     gDropdownIsColour = true;
     gDropdownLastColourHover = -1;
diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp
index 8f095076c5..89bea6e32d 100644
--- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp
+++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp
@@ -129,12 +129,7 @@ static constexpr const rct_string_id EditorStepNames[] = {
 rct_window* window_editor_bottom_toolbar_open()
 {
     rct_window* window = window_create(
-        0,
-        context_get_height() - 32,
-        context_get_width(),
-        32,
-        &window_editor_bottom_toolbar_events,
-        WC_BOTTOM_TOOLBAR,
+        0, context_get_height() - 32, context_get_width(), 32, &window_editor_bottom_toolbar_events, WC_BOTTOM_TOOLBAR,
         WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_BACKGROUND);
     window->widgets = window_editor_bottom_toolbar_widgets;
 
@@ -424,23 +419,19 @@ void window_editor_bottom_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi)
         if (drawPreviousButton)
         {
             gfx_filter_rect(
-                dpi,
-                window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].left + w->x,
+                dpi, window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].left + w->x,
                 window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].top + w->y,
                 window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].right + w->x,
-                window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].bottom + w->y,
-                PALETTE_51);
+                window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].bottom + w->y, PALETTE_51);
         }
 
         if ((drawPreviousButton || drawNextButton) && gS6Info.editor_step != EDITOR_STEP_ROLLERCOASTER_DESIGNER)
         {
             gfx_filter_rect(
-                dpi,
-                window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].left + w->x,
+                dpi, window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].left + w->x,
                 window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].top + w->y,
                 window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].right + w->x,
-                window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].bottom + w->y,
-                PALETTE_51);
+                window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].bottom + w->y, PALETTE_51);
         }
     }
 
@@ -451,25 +442,19 @@ void window_editor_bottom_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi)
         if (drawPreviousButton)
         {
             gfx_fill_rect_inset(
-                dpi,
-                window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].left + 1 + w->x,
+                dpi, window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].left + 1 + w->x,
                 window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].top + 1 + w->y,
                 window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].right - 1 + w->x,
-                window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].bottom - 1 + w->y,
-                w->colours[1],
-                INSET_RECT_F_30);
+                window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].bottom - 1 + w->y, w->colours[1], INSET_RECT_F_30);
         }
 
         if ((drawPreviousButton || drawNextButton) && gS6Info.editor_step != EDITOR_STEP_ROLLERCOASTER_DESIGNER)
         {
             gfx_fill_rect_inset(
-                dpi,
-                window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].left + 1 + w->x,
+                dpi, window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].left + 1 + w->x,
                 window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].top + 1 + w->y,
                 window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].right - 1 + w->x,
-                window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].bottom - 1 + w->y,
-                w->colours[1],
-                INSET_RECT_F_30);
+                window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].bottom - 1 + w->y, w->colours[1], INSET_RECT_F_30);
         }
 
         int16_t stateX = (window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].right
@@ -478,21 +463,14 @@ void window_editor_bottom_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi)
             + w->x;
         int16_t stateY = w->height - 0x0C + w->y;
         gfx_draw_string_centred(
-            dpi,
-            EditorStepNames[gS6Info.editor_step],
-            stateX,
-            stateY,
-            NOT_TRANSLUCENT(w->colours[2]) | COLOUR_FLAG_OUTLINE,
+            dpi, EditorStepNames[gS6Info.editor_step], stateX, stateY, NOT_TRANSLUCENT(w->colours[2]) | COLOUR_FLAG_OUTLINE,
             nullptr);
 
         if (drawPreviousButton)
         {
             gfx_draw_sprite(
-                dpi,
-                SPR_PREVIOUS,
-                window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].left + 6 + w->x,
-                window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].top + 6 + w->y,
-                0);
+                dpi, SPR_PREVIOUS, window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].left + 6 + w->x,
+                window_editor_bottom_toolbar_widgets[WIDX_PREVIOUS_IMAGE].top + 6 + w->y, 0);
 
             int32_t textColour = NOT_TRANSLUCENT(w->colours[1]);
             if (gHoverWidget.window_classification == WC_BOTTOM_TOOLBAR
@@ -518,11 +496,8 @@ void window_editor_bottom_toolbar_paint(rct_window* w, rct_drawpixelinfo* dpi)
         if ((drawPreviousButton || drawNextButton) && gS6Info.editor_step != EDITOR_STEP_ROLLERCOASTER_DESIGNER)
         {
             gfx_draw_sprite(
-                dpi,
-                SPR_NEXT,
-                window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].right - 29 + w->x,
-                window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].top + 6 + w->y,
-                0);
+                dpi, SPR_NEXT, window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].right - 29 + w->x,
+                window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].top + 6 + w->y, 0);
 
             int32_t textColour = NOT_TRANSLUCENT(w->colours[1]);
 
diff --git a/src/openrct2-ui/windows/EditorInventionsList.cpp b/src/openrct2-ui/windows/EditorInventionsList.cpp
index a9e76be1fa..32b4c1c5e7 100644
--- a/src/openrct2-ui/windows/EditorInventionsList.cpp
+++ b/src/openrct2-ui/windows/EditorInventionsList.cpp
@@ -669,11 +669,7 @@ static void window_editor_inventions_list_paint(rct_window* w, rct_drawpixelinfo
     // Preview background
     widget = &w->widgets[WIDX_PREVIEW];
     gfx_fill_rect(
-        dpi,
-        w->x + widget->left + 1,
-        w->y + widget->top + 1,
-        w->x + widget->right - 1,
-        w->y + widget->bottom - 1,
+        dpi, w->x + widget->left + 1, w->y + widget->top + 1, w->x + widget->right - 1, w->y + widget->bottom - 1,
         ColourMapA[w->colours[1]].darkest);
 
     researchItem = _editorInventionsListDraggedItem;
@@ -875,13 +871,8 @@ static void window_editor_inventions_list_drag_open(rct_research_item* researchI
     window_editor_inventions_list_drag_widgets[0].right = stringWidth;
 
     w = window_create(
-        gTooltipCursorX - (stringWidth / 2),
-        gTooltipCursorY - 7,
-        stringWidth,
-        14,
-        &window_editor_inventions_list_drag_events,
-        WC_EDITOR_INVENTION_LIST_DRAG,
-        WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_SNAPPING);
+        gTooltipCursorX - (stringWidth / 2), gTooltipCursorY - 7, stringWidth, 14, &window_editor_inventions_list_drag_events,
+        WC_EDITOR_INVENTION_LIST_DRAG, WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_SNAPPING);
     w->widgets = window_editor_inventions_list_drag_widgets;
     w->colours[1] = COLOUR_WHITE;
     input_window_position_begin(w, 0, gTooltipCursorX, gTooltipCursorY);
diff --git a/src/openrct2-ui/windows/EditorMain.cpp b/src/openrct2-ui/windows/EditorMain.cpp
index 67cbf2a7b6..06c52ef9e1 100644
--- a/src/openrct2-ui/windows/EditorMain.cpp
+++ b/src/openrct2-ui/windows/EditorMain.cpp
@@ -61,13 +61,8 @@ rct_window* window_editor_main_open()
     window_editor_main_widgets[0].right = context_get_width();
     window_editor_main_widgets[0].bottom = context_get_height();
     rct_window* window = window_create(
-        0,
-        0,
-        window_editor_main_widgets[0].right,
-        window_editor_main_widgets[0].bottom,
-        &window_editor_main_events,
-        WC_MAIN_WINDOW,
-        WF_STICK_TO_BACK);
+        0, 0, window_editor_main_widgets[0].right, window_editor_main_widgets[0].bottom, &window_editor_main_events,
+        WC_MAIN_WINDOW, WF_STICK_TO_BACK);
     window->widgets = window_editor_main_widgets;
 
     viewport_create(window, window->x, window->y, window->width, window->height, 0, 0x0FFF, 0x0FFF, 0, 0x1, -1);
diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp
index 7b6789d097..6ee878ffc7 100644
--- a/src/openrct2-ui/windows/EditorObjectSelection.cpp
+++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp
@@ -606,12 +606,8 @@ void window_editor_object_selection_mousedown(rct_window* w, rct_widgetindex wid
             }
 
             window_dropdown_show_text(
-                w->x + widget->left,
-                w->y + widget->top,
-                widget->bottom - widget->top + 1,
-                w->colours[widget->colour],
-                DROPDOWN_FLAG_STAY_OPEN,
-                _numSourceGameItems + numSelectionItems);
+                w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[widget->colour],
+                DROPDOWN_FLAG_STAY_OPEN, _numSourceGameItems + numSelectionItems);
 
             for (int32_t i = 0; i < _numSourceGameItems; i++)
             {
@@ -1005,11 +1001,7 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
     // Preview background
     widget = &w->widgets[WIDX_PREVIEW];
     gfx_fill_rect(
-        dpi,
-        w->x + widget->left + 1,
-        w->y + widget->top + 1,
-        w->x + widget->right - 1,
-        w->y + widget->bottom - 1,
+        dpi, w->x + widget->left + 1, w->y + widget->top + 1, w->x + widget->right - 1, w->y + widget->bottom - 1,
         ColourMapA[w->colours[1]].darkest);
 
     // Draw number of selected items
@@ -1034,12 +1026,7 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
     {
         stringId = _listSortType == RIDE_SORT_TYPE ? (_listSortDescending ? STR_DOWN : STR_UP) : STR_NONE;
         gfx_draw_string_left_clipped(
-            dpi,
-            STR_OBJECTS_SORT_TYPE,
-            &stringId,
-            w->colours[1],
-            w->x + widget->left + 1,
-            w->y + widget->top + 1,
+            dpi, STR_OBJECTS_SORT_TYPE, &stringId, w->colours[1], w->x + widget->left + 1, w->y + widget->top + 1,
             widget->right - widget->left);
     }
     widget = &w->widgets[WIDX_LIST_SORT_RIDE];
@@ -1047,12 +1034,7 @@ static void window_editor_object_selection_paint(rct_window* w, rct_drawpixelinf
     {
         stringId = _listSortType == RIDE_SORT_RIDE ? (_listSortDescending ? STR_DOWN : STR_UP) : STR_NONE;
         gfx_draw_string_left_clipped(
-            dpi,
-            STR_OBJECTS_SORT_RIDE,
-            &stringId,
-            w->colours[1],
-            w->x + widget->left + 1,
-            w->y + widget->top + 1,
+            dpi, STR_OBJECTS_SORT_RIDE, &stringId, w->colours[1], w->x + widget->left + 1, w->y + widget->top + 1,
             widget->right - widget->left);
     }
 
diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp
index 6e0f4c5d79..8fb7e79049 100644
--- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp
+++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp
@@ -487,14 +487,8 @@ static void window_editor_objective_options_show_objective_dropdown(rct_window*
     numItems++;
 
     window_dropdown_show_text_custom_width(
-        w->x + dropdownWidget->left,
-        w->y + dropdownWidget->top,
-        dropdownWidget->bottom - dropdownWidget->top + 1,
-        w->colours[1],
-        0,
-        DROPDOWN_FLAG_STAY_OPEN,
-        numItems,
-        dropdownWidget->right - dropdownWidget->left - 3);
+        w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+        w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, numItems, dropdownWidget->right - dropdownWidget->left - 3);
 
     objectiveType = gScenarioObjectiveType;
     for (int32_t j = 0; j < numItems; j++)
@@ -520,14 +514,8 @@ static void window_editor_objective_options_show_climate_dropdown(rct_window* w)
         gDropdownItemsArgs[i] = ClimateNames[i];
     }
     window_dropdown_show_text_custom_width(
-        w->x + dropdownWidget->left,
-        w->y + dropdownWidget->top,
-        dropdownWidget->bottom - dropdownWidget->top + 1,
-        w->colours[1],
-        0,
-        DROPDOWN_FLAG_STAY_OPEN,
-        4,
-        dropdownWidget->right - dropdownWidget->left - 3);
+        w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+        w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, 4, dropdownWidget->right - dropdownWidget->left - 3);
     dropdown_set_checked(gClimate, true);
 }
 
@@ -544,14 +532,8 @@ static void window_editor_objective_options_show_category_dropdown(rct_window* w
         gDropdownItemsArgs[i] = ScenarioCategoryStringIds[i];
     }
     window_dropdown_show_text_custom_width(
-        w->x + dropdownWidget->left,
-        w->y + dropdownWidget->top,
-        dropdownWidget->bottom - dropdownWidget->top + 1,
-        w->colours[1],
-        0,
-        DROPDOWN_FLAG_STAY_OPEN,
-        5,
-        dropdownWidget->right - dropdownWidget->left - 3);
+        w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+        w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, 5, dropdownWidget->right - dropdownWidget->left - 3);
     dropdown_set_checked(gS6Info.category, true);
 }
 
diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp
index fe56f3a67a..a420660e51 100644
--- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp
+++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp
@@ -487,25 +487,15 @@ static void window_editor_scenario_options_financial_mouseup(rct_window* w, rct_
             }
 
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                EDIT_SCENARIOOPTIONS_SETNOMONEY,
-                newMoneySetting,
-                GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETNOMONEY, newMoneySetting,
+                GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             window_invalidate(w);
             break;
         }
         case WIDX_FORBID_MARKETING:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                EDIT_SCENARIOOPTIONS_SETFORBIDMARKETINGCAMPAIGNS,
-                gParkFlags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN ? 0 : 1,
-                GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETFORBIDMARKETINGCAMPAIGNS,
+                gParkFlags & PARK_FLAGS_FORBID_MARKETING_CAMPAIGN ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             window_invalidate(w);
             break;
     }
@@ -532,13 +522,8 @@ static void window_editor_scenario_options_financial_mousedown(rct_window* w, rc
             if (gInitialCash < MONEY(1000000, 00))
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETINITIALCASH,
-                    gInitialCash + MONEY(500, 00),
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETINITIALCASH, gInitialCash + MONEY(500, 00),
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -550,13 +535,8 @@ static void window_editor_scenario_options_financial_mousedown(rct_window* w, rc
             if (gInitialCash > MONEY(0, 00))
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETINITIALCASH,
-                    gInitialCash - MONEY(500, 00),
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETINITIALCASH, gInitialCash - MONEY(500, 00),
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -568,13 +548,8 @@ static void window_editor_scenario_options_financial_mousedown(rct_window* w, rc
             if (gBankLoan < MONEY(5000000, 00))
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETINITIALLOAN,
-                    gBankLoan + MONEY(1000, 00),
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETINITIALLOAN, gBankLoan + MONEY(1000, 00),
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -586,13 +561,8 @@ static void window_editor_scenario_options_financial_mousedown(rct_window* w, rc
             if (gBankLoan > MONEY(0, 00))
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETINITIALLOAN,
-                    gBankLoan - MONEY(1000, 00),
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETINITIALLOAN, gBankLoan - MONEY(1000, 00),
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -604,13 +574,8 @@ static void window_editor_scenario_options_financial_mousedown(rct_window* w, rc
             if (gMaxBankLoan < MONEY(5000000, 00))
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETMAXIMUMLOANSIZE,
-                    gMaxBankLoan + MONEY(1000, 00),
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETMAXIMUMLOANSIZE, gMaxBankLoan + MONEY(1000, 00),
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -622,13 +587,8 @@ static void window_editor_scenario_options_financial_mousedown(rct_window* w, rc
             if (gMaxBankLoan > MONEY(0, 00))
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETMAXIMUMLOANSIZE,
-                    gMaxBankLoan - MONEY(1000, 00),
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETMAXIMUMLOANSIZE, gMaxBankLoan - MONEY(1000, 00),
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -640,13 +600,8 @@ static void window_editor_scenario_options_financial_mousedown(rct_window* w, rc
             if (gBankLoanInterestRate < 80)
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETANNUALINTERESTRATE,
-                    gBankLoanInterestRate + 1,
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETANNUALINTERESTRATE, gBankLoanInterestRate + 1,
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -660,24 +615,14 @@ static void window_editor_scenario_options_financial_mousedown(rct_window* w, rc
                 if (gBankLoanInterestRate > 80)
                 {
                     game_do_command(
-                        0,
-                        GAME_COMMAND_FLAG_APPLY,
-                        EDIT_SCENARIOOPTIONS_SETANNUALINTERESTRATE,
-                        80,
-                        GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                        0,
-                        0);
+                        0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETANNUALINTERESTRATE, 80,
+                        GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
                 }
                 else
                 {
                     game_do_command(
-                        0,
-                        GAME_COMMAND_FLAG_APPLY,
-                        EDIT_SCENARIOOPTIONS_SETANNUALINTERESTRATE,
-                        gBankLoanInterestRate - 1,
-                        GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                        0,
-                        0);
+                        0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETANNUALINTERESTRATE, gBankLoanInterestRate - 1,
+                        GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
                 }
             }
             else
@@ -836,24 +781,14 @@ static void window_editor_scenario_options_guests_mouseup(rct_window* w, rct_wid
             break;
         case WIDX_GUEST_PREFER_LESS_INTENSE_RIDES:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                EDIT_SCENARIOOPTIONS_SETGUESTSPREFERLESSINTENSERIDES,
-                gParkFlags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES ? 0 : 1,
-                GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETGUESTSPREFERLESSINTENSERIDES,
+                gParkFlags & PARK_FLAGS_PREF_LESS_INTENSE_RIDES ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             window_invalidate(w);
             break;
         case WIDX_GUEST_PREFER_MORE_INTENSE_RIDES:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                EDIT_SCENARIOOPTIONS_SETGUESTSPREFERMOREINTENSERIDES,
-                gParkFlags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES ? 0 : 1,
-                GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETGUESTSPREFERMOREINTENSERIDES,
+                gParkFlags & PARK_FLAGS_PREF_MORE_INTENSE_RIDES ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             window_invalidate(w);
             break;
     }
@@ -880,13 +815,8 @@ static void window_editor_scenario_options_guests_mousedown(rct_window* w, rct_w
             if (gGuestInitialCash < MONEY(1000, 00))
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETAVERAGECASHPERGUEST,
-                    gGuestInitialCash + MONEY(1, 00),
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETAVERAGECASHPERGUEST, gGuestInitialCash + MONEY(1, 00),
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -898,13 +828,8 @@ static void window_editor_scenario_options_guests_mousedown(rct_window* w, rct_w
             if (gGuestInitialCash > MONEY(0, 00))
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETAVERAGECASHPERGUEST,
-                    gGuestInitialCash - MONEY(1, 00),
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETAVERAGECASHPERGUEST, gGuestInitialCash - MONEY(1, 00),
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -916,13 +841,8 @@ static void window_editor_scenario_options_guests_mousedown(rct_window* w, rct_w
             if (gGuestInitialHappiness < 250)
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETGUESTINITIALHAPPINESS,
-                    gGuestInitialHappiness + 4,
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETGUESTINITIALHAPPINESS, gGuestInitialHappiness + 4,
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -934,13 +854,8 @@ static void window_editor_scenario_options_guests_mousedown(rct_window* w, rct_w
             if (gGuestInitialHappiness > 40)
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETGUESTINITIALHAPPINESS,
-                    gGuestInitialHappiness - 4,
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETGUESTINITIALHAPPINESS, gGuestInitialHappiness - 4,
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -952,13 +867,8 @@ static void window_editor_scenario_options_guests_mousedown(rct_window* w, rct_w
             if (gGuestInitialHunger > 40)
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETGUESTINITIALHUNGER,
-                    gGuestInitialHunger - 4,
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETGUESTINITIALHUNGER, gGuestInitialHunger - 4,
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -970,13 +880,8 @@ static void window_editor_scenario_options_guests_mousedown(rct_window* w, rct_w
             if (gGuestInitialHunger < 250)
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETGUESTINITIALHUNGER,
-                    gGuestInitialHunger + 4,
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETGUESTINITIALHUNGER, gGuestInitialHunger + 4,
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -988,13 +893,8 @@ static void window_editor_scenario_options_guests_mousedown(rct_window* w, rct_w
             if (gGuestInitialThirst > 40)
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETGUESTINITIALTHIRST,
-                    gGuestInitialThirst - 4,
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETGUESTINITIALTHIRST, gGuestInitialThirst - 4,
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -1006,13 +906,8 @@ static void window_editor_scenario_options_guests_mousedown(rct_window* w, rct_w
             if (gGuestInitialThirst < 250)
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETGUESTINITIALTHIRST,
-                    gGuestInitialThirst + 4,
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETGUESTINITIALTHIRST, gGuestInitialThirst + 4,
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -1163,57 +1058,32 @@ static void window_editor_scenario_options_park_mouseup(rct_window* w, rct_widge
             break;
         case WIDX_FORBID_TREE_REMOVAL:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                EDIT_SCENARIOOPTIONS_SETFORBIDTREEREMOVAL,
-                gParkFlags & PARK_FLAGS_FORBID_TREE_REMOVAL ? 0 : 1,
-                GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETFORBIDTREEREMOVAL,
+                gParkFlags & PARK_FLAGS_FORBID_TREE_REMOVAL ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             window_invalidate(w);
             break;
         case WIDX_FORBID_LANDSCAPE_CHANGES:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                EDIT_SCENARIOOPTIONS_SETFORBIDLANDSCAPECHANGES,
-                gParkFlags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES ? 0 : 1,
-                GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETFORBIDLANDSCAPECHANGES,
+                gParkFlags & PARK_FLAGS_FORBID_LANDSCAPE_CHANGES ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             window_invalidate(w);
             break;
         case WIDX_FORBID_HIGH_CONSTRUCTION:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                EDIT_SCENARIOOPTIONS_SETFORBIDHIGHCONSTRUCTION,
-                gParkFlags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION ? 0 : 1,
-                GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETFORBIDHIGHCONSTRUCTION,
+                gParkFlags & PARK_FLAGS_FORBID_HIGH_CONSTRUCTION ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             window_invalidate(w);
             break;
         case WIDX_HARD_PARK_RATING:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                EDIT_SCENARIOOPTIONS_SETPARKRATINGHIGHERDIFFICULTLEVEL,
-                gParkFlags & PARK_FLAGS_DIFFICULT_PARK_RATING ? 0 : 1,
-                GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETPARKRATINGHIGHERDIFFICULTLEVEL,
+                gParkFlags & PARK_FLAGS_DIFFICULT_PARK_RATING ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             window_invalidate(w);
             break;
         case WIDX_HARD_GUEST_GENERATION:
             game_do_command(
-                0,
-                GAME_COMMAND_FLAG_APPLY,
-                EDIT_SCENARIOOPTIONS_SETGUESTGENERATIONHIGHERDIFFICULTLEVEL,
-                gParkFlags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION ? 0 : 1,
-                GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                0,
-                0);
+                0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETGUESTGENERATIONHIGHERDIFFICULTLEVEL,
+                gParkFlags & PARK_FLAGS_DIFFICULT_GUEST_GENERATION ? 0 : 1, GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             window_invalidate(w);
             break;
     }
@@ -1242,13 +1112,8 @@ static void window_editor_scenario_options_park_mousedown(rct_window* w, rct_wid
             if (gLandPrice < MONEY(200, 00))
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETCOSTTOBUYLAND,
-                    gLandPrice + MONEY(1, 00),
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETCOSTTOBUYLAND, gLandPrice + MONEY(1, 00),
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -1260,13 +1125,8 @@ static void window_editor_scenario_options_park_mousedown(rct_window* w, rct_wid
             if (gLandPrice > MONEY(5, 00))
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETCOSTTOBUYLAND,
-                    gLandPrice - MONEY(1, 00),
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETCOSTTOBUYLAND, gLandPrice - MONEY(1, 00),
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -1278,13 +1138,8 @@ static void window_editor_scenario_options_park_mousedown(rct_window* w, rct_wid
             if (gConstructionRightsPrice < MONEY(200, 00))
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETCOSTTOBUYCONSTRUCTIONRIGHTS,
-                    gConstructionRightsPrice + MONEY(1, 00),
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETCOSTTOBUYCONSTRUCTIONRIGHTS,
+                    gConstructionRightsPrice + MONEY(1, 00), GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -1296,13 +1151,8 @@ static void window_editor_scenario_options_park_mousedown(rct_window* w, rct_wid
             if (gConstructionRightsPrice > MONEY(5, 00))
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETCOSTTOBUYCONSTRUCTIONRIGHTS,
-                    gConstructionRightsPrice - MONEY(1, 00),
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETCOSTTOBUYCONSTRUCTIONRIGHTS,
+                    gConstructionRightsPrice - MONEY(1, 00), GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -1314,13 +1164,8 @@ static void window_editor_scenario_options_park_mousedown(rct_window* w, rct_wid
             if (gParkEntranceFee < MAX_ENTRANCE_FEE)
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETPARKCHARGEENTRYFEE,
-                    gParkEntranceFee + MONEY(1, 00),
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETPARKCHARGEENTRYFEE, gParkEntranceFee + MONEY(1, 00),
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -1332,13 +1177,8 @@ static void window_editor_scenario_options_park_mousedown(rct_window* w, rct_wid
             if (gParkEntranceFee > MONEY(0, 00))
             {
                 game_do_command(
-                    0,
-                    GAME_COMMAND_FLAG_APPLY,
-                    EDIT_SCENARIOOPTIONS_SETPARKCHARGEENTRYFEE,
-                    gParkEntranceFee - MONEY(1, 00),
-                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-                    0,
-                    0);
+                    0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETPARKCHARGEENTRYFEE, gParkEntranceFee - MONEY(1, 00),
+                    GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
             }
             else
             {
@@ -1357,14 +1197,8 @@ static void window_editor_scenario_options_park_mousedown(rct_window* w, rct_wid
             gDropdownItemsArgs[2] = STR_PAID_ENTRY_PAID_RIDES;
 
             window_dropdown_show_text_custom_width(
-                w->x + dropdownWidget->left,
-                w->y + dropdownWidget->top,
-                dropdownWidget->bottom - dropdownWidget->top - 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                3,
-                dropdownWidget->right - dropdownWidget->left - 3);
+                w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top - 1,
+                w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, 3, dropdownWidget->right - dropdownWidget->left - 3);
 
             if (gParkFlags & PARK_FLAGS_UNLOCK_ALL_PRICES)
                 dropdown_set_checked(2, true);
@@ -1386,13 +1220,8 @@ static void window_editor_scenario_options_park_dropdown(rct_window* w, rct_widg
     if (widgetIndex == WIDX_PAY_FOR_PARK_OR_RIDES_DROPDOWN && dropdownIndex != -1)
     {
         game_do_command(
-            0,
-            GAME_COMMAND_FLAG_APPLY,
-            EDIT_SCENARIOOPTIONS_SETPARKCHARGEMETHOD,
-            dropdownIndex,
-            GAME_COMMAND_EDIT_SCENARIO_OPTIONS,
-            0,
-            0);
+            0, GAME_COMMAND_FLAG_APPLY, EDIT_SCENARIOOPTIONS_SETPARKCHARGEMETHOD, dropdownIndex,
+            GAME_COMMAND_EDIT_SCENARIO_OPTIONS, 0, 0);
         window_invalidate(w);
     }
 }
diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp
index 59b2d918ec..8a3778a6b0 100644
--- a/src/openrct2-ui/windows/Finances.cpp
+++ b/src/openrct2-ui/windows/Finances.cpp
@@ -705,11 +705,7 @@ static void window_finances_summary_paint(rct_window* w, rct_drawpixelinfo* dpi)
         money32 lastMonthProfit = finance_get_last_month_shop_profit();
         set_format_arg(0, money32, lastMonthProfit);
         gfx_draw_string_left(
-            dpi,
-            STR_LAST_MONTH_PROFIT_FROM_FOOD_DRINK_MERCHANDISE_SALES_LABEL,
-            gCommonFormatArgs,
-            COLOUR_BLACK,
-            w->x + 280,
+            dpi, STR_LAST_MONTH_PROFIT_FROM_FOOD_DRINK_MERCHANDISE_SALES_LABEL, gCommonFormatArgs, COLOUR_BLACK, w->x + 280,
             w->y + 279);
     }
     else
@@ -753,12 +749,8 @@ static void window_finances_summary_scrollpaint(rct_window* w, rct_drawpixelinfo
         set_format_arg(0, rct_string_id, STR_FINANCES_SUMMARY_MONTH_HEADING);
         set_format_arg(2, uint16_t, monthyear);
         draw_string_right_underline(
-            dpi,
-            monthyear == currentMonthYear ? STR_WINDOW_COLOUR_2_STRINGID : STR_BLACK_STRING,
-            gCommonFormatArgs,
-            COLOUR_BLACK,
-            x + EXPENDITURE_COLUMN_WIDTH,
-            y);
+            dpi, monthyear == currentMonthYear ? STR_WINDOW_COLOUR_2_STRINGID : STR_BLACK_STRING, gCommonFormatArgs,
+            COLOUR_BLACK, x + EXPENDITURE_COLUMN_WIDTH, y);
         y += 14;
 
         // Month expenditures
@@ -770,12 +762,8 @@ static void window_finances_summary_scrollpaint(rct_window* w, rct_drawpixelinfo
             {
                 profit += expenditure;
                 gfx_draw_string_right(
-                    dpi,
-                    expenditure >= 0 ? STR_FINANCES_SUMMARY_INCOME_VALUE : STR_FINANCES_SUMMARY_EXPENDITURE_VALUE,
-                    &expenditure,
-                    COLOUR_BLACK,
-                    x + EXPENDITURE_COLUMN_WIDTH,
-                    y);
+                    dpi, expenditure >= 0 ? STR_FINANCES_SUMMARY_INCOME_VALUE : STR_FINANCES_SUMMARY_EXPENDITURE_VALUE,
+                    &expenditure, COLOUR_BLACK, x + EXPENDITURE_COLUMN_WIDTH, y);
             }
             y += TABLE_CELL_HEIGHT;
         }
@@ -783,12 +771,8 @@ static void window_finances_summary_scrollpaint(rct_window* w, rct_drawpixelinfo
 
         // Month profit
         gfx_draw_string_right(
-            dpi,
-            profit >= 0 ? STR_FINANCES_SUMMARY_INCOME_VALUE : STR_FINANCES_SUMMARY_LOSS_VALUE,
-            &profit,
-            COLOUR_BLACK,
-            x + EXPENDITURE_COLUMN_WIDTH,
-            y);
+            dpi, profit >= 0 ? STR_FINANCES_SUMMARY_INCOME_VALUE : STR_FINANCES_SUMMARY_LOSS_VALUE, &profit, COLOUR_BLACK,
+            x + EXPENDITURE_COLUMN_WIDTH, y);
         gfx_fill_rect(dpi, x + 10, y - 2, x + EXPENDITURE_COLUMN_WIDTH, y - 2, PALETTE_INDEX_10);
 
         x += EXPENDITURE_COLUMN_WIDTH;
@@ -864,10 +848,7 @@ static void window_finances_financial_graph_paint(rct_window* w, rct_drawpixelin
         dpi,
         cashLessLoan >= 0 ? STR_FINANCES_FINANCIAL_GRAPH_CASH_LESS_LOAN_POSITIVE
                           : STR_FINANCES_FINANCIAL_GRAPH_CASH_LESS_LOAN_NEGATIVE,
-        &cashLessLoan,
-        COLOUR_BLACK,
-        graphLeft,
-        graphTop - 11);
+        &cashLessLoan, COLOUR_BLACK, graphLeft, graphTop - 11);
 
     // Graph
     gfx_fill_rect_inset(dpi, graphLeft, graphTop, graphRight, graphBottom, w->colours[1], INSET_RECT_F_30);
@@ -1070,12 +1051,8 @@ static void window_finances_profit_graph_paint(rct_window* w, rct_drawpixelinfo*
     // Weekly profit
     money32 weeklyPofit = gCurrentProfit;
     gfx_draw_string_left(
-        dpi,
-        weeklyPofit >= 0 ? STR_FINANCES_WEEKLY_PROFIT_POSITIVE : STR_FINANCES_WEEKLY_PROFIT_LOSS,
-        &weeklyPofit,
-        COLOUR_BLACK,
-        graphLeft,
-        graphTop - 11);
+        dpi, weeklyPofit >= 0 ? STR_FINANCES_WEEKLY_PROFIT_POSITIVE : STR_FINANCES_WEEKLY_PROFIT_LOSS, &weeklyPofit,
+        COLOUR_BLACK, graphLeft, graphTop - 11);
 
     // Graph
     gfx_fill_rect_inset(dpi, graphLeft, graphTop, graphRight, graphBottom, w->colours[1], INSET_RECT_F_30);
@@ -1329,14 +1306,8 @@ static void window_finances_research_mousedown(rct_window* w, rct_widgetindex wi
         gDropdownItemsArgs[i] = ResearchFundingLevelNames[i];
     }
     window_dropdown_show_text_custom_width(
-        w->x + dropdownWidget->left,
-        w->y + dropdownWidget->top,
-        dropdownWidget->bottom - dropdownWidget->top + 1,
-        w->colours[1],
-        0,
-        DROPDOWN_FLAG_STAY_OPEN,
-        4,
-        dropdownWidget->right - dropdownWidget->left - 3);
+        w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+        w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, 4, dropdownWidget->right - dropdownWidget->left - 3);
 
     int32_t currentResearchLevel = gResearchFundingLevel;
     dropdown_set_checked(currentResearchLevel, true);
diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp
index 4139168c63..98e259edbb 100644
--- a/src/openrct2-ui/windows/Footpath.cpp
+++ b/src/openrct2-ui/windows/Footpath.cpp
@@ -680,14 +680,7 @@ static void window_footpath_show_footpath_types_dialog(rct_window* w, rct_widget
     }
 
     window_dropdown_show_image(
-        w->x + widget->left,
-        w->y + widget->top,
-        widget->bottom - widget->top + 1,
-        w->colours[1],
-        0,
-        numPathTypes,
-        47,
-        36,
+        w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0, numPathTypes, 47, 36,
         gAppropriateImageDropdownItemsPerRow[numPathTypes]);
 }
 
@@ -728,14 +721,8 @@ static void window_footpath_set_provisional_path_at_point(int32_t x, int32_t y)
     rct_tile_element* tileElement;
     LocationXY16 mapCoord = {};
     get_map_coordinates_from_pos(
-        x,
-        y,
-        VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_TERRAIN,
-        &mapCoord.x,
-        &mapCoord.y,
-        &interactionType,
-        &tileElement,
-        nullptr);
+        x, y, VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_TERRAIN, &mapCoord.x, &mapCoord.y,
+        &interactionType, &tileElement, nullptr);
     x = mapCoord.x;
     y = mapCoord.y;
 
@@ -849,14 +836,8 @@ static void window_footpath_place_path_at_point(int32_t x, int32_t y)
 
     LocationXY16 mapCoord = {};
     get_map_coordinates_from_pos(
-        x,
-        y,
-        VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_TERRAIN,
-        &mapCoord.x,
-        &mapCoord.y,
-        &interactionType,
-        &tileElement,
-        nullptr);
+        x, y, VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_TERRAIN, &mapCoord.x, &mapCoord.y,
+        &interactionType, &tileElement, nullptr);
     x = mapCoord.x;
     y = mapCoord.y;
 
@@ -976,9 +957,7 @@ static void window_footpath_construct()
     if (cost != MONEY32_UNDEFINED)
     {
         audio_play_sound_at_location(
-            SOUND_PLACE_ITEM,
-            gFootpathConstructFromPosition.x,
-            gFootpathConstructFromPosition.y,
+            SOUND_PLACE_ITEM, gFootpathConstructFromPosition.x, gFootpathConstructFromPosition.y,
             gFootpathConstructFromPosition.z);
 
         if (gFootpathConstructSlope == 0)
diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp
index 3cd9aa7f78..c82c5f2193 100644
--- a/src/openrct2-ui/windows/GameBottomToolbar.cpp
+++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp
@@ -134,12 +134,7 @@ rct_window* window_game_bottom_toolbar_open()
     uint32_t toolbar_height = line_height * 2 + 12;
 
     rct_window* window = window_create(
-        0,
-        screenHeight - toolbar_height,
-        screenWidth,
-        toolbar_height,
-        &window_game_bottom_toolbar_events,
-        WC_BOTTOM_TOOLBAR,
+        0, screenHeight - toolbar_height, screenWidth, toolbar_height, &window_game_bottom_toolbar_events, WC_BOTTOM_TOOLBAR,
         WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_BACKGROUND);
     window->widgets = window_game_bottom_toolbar_widgets;
     window->enabled_widgets |= (1 << WIDX_LEFT_OUTSET) | (1 << WIDX_MONEY) | (1 << WIDX_GUESTS) | (1 << WIDX_PARK_RATING)
@@ -379,30 +374,24 @@ static void window_game_bottom_toolbar_paint(rct_window* w, rct_drawpixelinfo* d
 {
     // Draw panel grey backgrounds
     gfx_filter_rect(
-        dpi,
-        w->x + window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET].left,
+        dpi, w->x + window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET].left,
         w->y + window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET].top,
         w->x + window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET].right,
-        w->y + window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET].bottom,
-        PALETTE_51);
+        w->y + window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET].bottom, PALETTE_51);
     gfx_filter_rect(
-        dpi,
-        w->x + window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].left,
+        dpi, w->x + window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].left,
         w->y + window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].top,
         w->x + window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].right,
-        w->y + window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].bottom,
-        PALETTE_51);
+        w->y + window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].bottom, PALETTE_51);
 
     if (theme_get_flags() & UITHEME_FLAG_USE_FULL_BOTTOM_TOOLBAR)
     {
         // Draw grey background
         gfx_filter_rect(
-            dpi,
-            w->x + window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET].left,
+            dpi, w->x + window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET].left,
             w->y + window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET].top,
             w->x + window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET].right,
-            w->y + window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET].bottom,
-            PALETTE_51);
+            w->y + window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET].bottom, PALETTE_51);
     }
 
     window_draw_widgets(w, dpi);
@@ -424,13 +413,10 @@ static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo* dpi, r
 {
     // Draw green inset rectangle on panel
     gfx_fill_rect_inset(
-        dpi,
-        w->x + window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET].left + 1,
+        dpi, w->x + window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET].left + 1,
         w->y + window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET].top + 1,
         w->x + window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET].right - 1,
-        w->y + window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET].bottom - 1,
-        w->colours[1],
-        INSET_RECT_F_30);
+        w->y + window_game_bottom_toolbar_widgets[WIDX_LEFT_OUTSET].bottom - 1, w->colours[1], INSET_RECT_F_30);
 
     // Figure out how much line height we have to work with.
     uint32_t line_height = font_get_line_height(FONT_SPRITE_BASE_MEDIUM);
@@ -444,10 +430,7 @@ static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo* dpi, r
 
         set_format_arg(0, money32, gCash);
         gfx_draw_string_centred(
-            dpi,
-            (gCash < 0 ? STR_BOTTOM_TOOLBAR_CASH_NEGATIVE : STR_BOTTOM_TOOLBAR_CASH),
-            x,
-            y,
+            dpi, (gCash < 0 ? STR_BOTTOM_TOOLBAR_CASH_NEGATIVE : STR_BOTTOM_TOOLBAR_CASH), x, y,
             (gHoverWidget.window_classification == WC_BOTTOM_TOOLBAR && gHoverWidget.widget_index == WIDX_MONEY
                  ? COLOUR_WHITE
                  : NOT_TRANSLUCENT(w->colours[0])),
@@ -475,8 +458,7 @@ static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo* dpi, r
         gfx_draw_string_centred(
             dpi,
             gNumGuestsInPark == 1 ? guestCountFormatsSingular[gGuestChangeModifier] : guestCountFormats[gGuestChangeModifier],
-            x,
-            y,
+            x, y,
             (gHoverWidget.window_classification == WC_BOTTOM_TOOLBAR && gHoverWidget.widget_index == WIDX_GUESTS
                  ? COLOUR_WHITE
                  : NOT_TRANSLUCENT(w->colours[0])),
@@ -519,13 +501,10 @@ static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo* dpi,
 {
     // Draw green inset rectangle on panel
     gfx_fill_rect_inset(
-        dpi,
-        w->x + window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].left + 1,
+        dpi, w->x + window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].left + 1,
         w->y + window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].top + 1,
         w->x + window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].right - 1,
-        w->y + window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].bottom - 1,
-        w->colours[1],
-        INSET_RECT_F_30);
+        w->y + window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].bottom - 1, w->colours[1], INSET_RECT_F_30);
 
     int32_t x = (window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].left
                  + window_game_bottom_toolbar_widgets[WIDX_RIGHT_OUTSET].right)
@@ -543,10 +522,7 @@ static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo* dpi,
     set_format_arg(2, int16_t, month);
     set_format_arg(4, int16_t, year);
     gfx_draw_string_centred(
-        dpi,
-        stringId,
-        x,
-        y,
+        dpi, stringId, x, y,
         (gHoverWidget.window_classification == WC_BOTTOM_TOOLBAR && gHoverWidget.widget_index == WIDX_DATE
              ? COLOUR_WHITE
              : NOT_TRANSLUCENT(w->colours[0])),
@@ -601,13 +577,8 @@ static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo* dpi, rc
 
     // Current news item
     gfx_fill_rect_inset(
-        dpi,
-        w->x + middleOutsetWidget->left + 1,
-        w->y + middleOutsetWidget->top + 1,
-        w->x + middleOutsetWidget->right - 1,
-        w->y + middleOutsetWidget->bottom - 1,
-        w->colours[2],
-        INSET_RECT_F_30);
+        dpi, w->x + middleOutsetWidget->left + 1, w->y + middleOutsetWidget->top + 1, w->x + middleOutsetWidget->right - 1,
+        w->y + middleOutsetWidget->bottom - 1, w->colours[2], INSET_RECT_F_30);
 
     // Text
     utf8* newsItemText = newsItem->Text;
@@ -699,13 +670,8 @@ static void window_game_bottom_toolbar_draw_middle_panel(rct_drawpixelinfo* dpi,
     rct_widget* middleOutsetWidget = &window_game_bottom_toolbar_widgets[WIDX_MIDDLE_OUTSET];
 
     gfx_fill_rect_inset(
-        dpi,
-        w->x + middleOutsetWidget->left + 1,
-        w->y + middleOutsetWidget->top + 1,
-        w->x + middleOutsetWidget->right - 1,
-        w->y + middleOutsetWidget->bottom - 1,
-        w->colours[1],
-        INSET_RECT_F_30);
+        dpi, w->x + middleOutsetWidget->left + 1, w->y + middleOutsetWidget->top + 1, w->x + middleOutsetWidget->right - 1,
+        w->y + middleOutsetWidget->bottom - 1, w->colours[1], INSET_RECT_F_30);
 
     // Figure out how much line height we have to work with.
     uint32_t line_height = font_get_line_height(FONT_SPRITE_BASE_MEDIUM);
diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp
index 4f715064e0..507273a34c 100644
--- a/src/openrct2-ui/windows/Guest.cpp
+++ b/src/openrct2-ui/windows/Guest.cpp
@@ -799,17 +799,8 @@ void window_guest_viewport_init(rct_window* w)
             int32_t height = view_widget->bottom - view_widget->top - 1;
 
             viewport_create(
-                w,
-                x,
-                y,
-                width,
-                height,
-                0,
-                focus.coordinate.x,
-                focus.coordinate.y,
-                focus.coordinate.z,
-                focus.sprite.type & VIEWPORT_FOCUS_TYPE_MASK,
-                focus.sprite.sprite_id);
+                w, x, y, width, height, 0, focus.coordinate.x, focus.coordinate.y, focus.coordinate.z,
+                focus.sprite.type & VIEWPORT_FOCUS_TYPE_MASK, focus.sprite.sprite_id);
             w->flags |= WF_NO_SCROLLING;
             window_invalidate(w);
         }
diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp
index f360ec8692..bc3081a8d2 100644
--- a/src/openrct2-ui/windows/GuestList.cpp
+++ b/src/openrct2-ui/windows/GuestList.cpp
@@ -334,13 +334,8 @@ static void window_guest_list_mouseup(rct_window* w, rct_widgetindex widgetIndex
             else
             {
                 window_text_input_open(
-                    w,
-                    WIDX_FILTER_BY_NAME,
-                    STR_GUESTS_FILTER_BY_NAME,
-                    STR_GUESTS_ENTER_NAME_TO_SEARCH,
-                    STR_STRING,
-                    (uintptr_t)&_window_guest_list_filter_name,
-                    sizeof(_window_guest_list_filter_name));
+                    w, WIDX_FILTER_BY_NAME, STR_GUESTS_FILTER_BY_NAME, STR_GUESTS_ENTER_NAME_TO_SEARCH, STR_STRING,
+                    (uintptr_t)&_window_guest_list_filter_name, sizeof(_window_guest_list_filter_name));
             }
             break;
     }
@@ -401,14 +396,8 @@ static void window_guest_list_mousedown(rct_window* w, rct_widgetindex widgetInd
             widget = &w->widgets[widgetIndex - 1];
 
             window_dropdown_show_text_custom_width(
-                w->x + widget->left,
-                w->y + widget->top,
-                widget->bottom - widget->top + 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                _window_guest_list_num_pages,
-                widget->right - widget->left - 3);
+                w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0,
+                DROPDOWN_FLAG_STAY_OPEN, _window_guest_list_num_pages, widget->right - widget->left - 3);
 
             for (i = 0; i < _window_guest_list_num_pages; i++)
             {
@@ -427,14 +416,8 @@ static void window_guest_list_mousedown(rct_window* w, rct_widgetindex widgetInd
             }
 
             window_dropdown_show_text_custom_width(
-                w->x + widget->left,
-                w->y + widget->top,
-                widget->bottom - widget->top + 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                2,
-                widget->right - widget->left - 3);
+                w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0,
+                DROPDOWN_FLAG_STAY_OPEN, 2, widget->right - widget->left - 3);
 
             dropdown_set_checked(_window_guest_list_selected_view, true);
             break;
@@ -690,20 +673,14 @@ static void window_guest_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
     i += g_peep_animation_entries[PEEP_SPRITE_TYPE_NORMAL].sprite_animation->base_image + 1;
     i |= 0xA1600000;
     gfx_draw_sprite(
-        dpi,
-        i,
-        (window_guest_list_widgets[WIDX_TAB_1].left + window_guest_list_widgets[WIDX_TAB_1].right) / 2 + w->x,
-        window_guest_list_widgets[WIDX_TAB_1].bottom - 6 + w->y,
-        0);
+        dpi, i, (window_guest_list_widgets[WIDX_TAB_1].left + window_guest_list_widgets[WIDX_TAB_1].right) / 2 + w->x,
+        window_guest_list_widgets[WIDX_TAB_1].bottom - 6 + w->y, 0);
 
     // Tab 2 image
     i = (_window_guest_list_selected_tab == 1 ? w->list_information_type / 4 : 0);
     gfx_draw_sprite(
-        dpi,
-        SPR_TAB_GUESTS_0 + i,
-        window_guest_list_widgets[WIDX_TAB_2].left + w->x,
-        window_guest_list_widgets[WIDX_TAB_2].top + w->y,
-        0);
+        dpi, SPR_TAB_GUESTS_0 + i, window_guest_list_widgets[WIDX_TAB_2].left + w->x,
+        window_guest_list_widgets[WIDX_TAB_2].top + w->y, 0);
 
     // Filter description
     x = w->x + 6;
@@ -739,12 +716,8 @@ static void window_guest_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
         y = w->y + window_guest_list_widgets[WIDX_GUEST_LIST].bottom + 2;
         set_format_arg(0, int16_t, w->var_492);
         gfx_draw_string_left(
-            dpi,
-            (w->var_492 == 1 ? STR_FORMAT_NUM_GUESTS_SINGULAR : STR_FORMAT_NUM_GUESTS_PLURAL),
-            gCommonFormatArgs,
-            COLOUR_BLACK,
-            x,
-            y);
+            dpi, (w->var_492 == 1 ? STR_FORMAT_NUM_GUESTS_SINGULAR : STR_FORMAT_NUM_GUESTS_PLURAL), gCommonFormatArgs,
+            COLOUR_BLACK, x, y);
     }
 }
 
@@ -870,11 +843,8 @@ static void window_guest_list_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi,
                     numGuests = _window_guest_list_groups_num_guests[i];
                     for (j = 0; j < 56 && j < numGuests; j++)
                         gfx_draw_sprite(
-                            dpi,
-                            _window_guest_list_groups_guest_faces[i * 56 + j] + SPR_PEEP_SMALL_FACE_VERY_VERY_UNHAPPY,
-                            j * 8,
-                            y + 12,
-                            0);
+                            dpi, _window_guest_list_groups_guest_faces[i * 56 + j] + SPR_PEEP_SMALL_FACE_VERY_VERY_UNHAPPY,
+                            j * 8, y + 12, 0);
 
                     // Draw action
                     set_format_arg(0, uint32_t, _window_guest_list_groups_argument_1[i]);
@@ -1093,8 +1063,7 @@ static void window_guest_list_find_groups()
             memcpy(temp_faces, &(_window_guest_list_groups_guest_faces[groupIndex * 56]), 56);
             memcpy(
                 &(_window_guest_list_groups_guest_faces[groupIndex * 56]),
-                &(_window_guest_list_groups_guest_faces[swap_position * 56]),
-                56);
+                &(_window_guest_list_groups_guest_faces[swap_position * 56]), 56);
             memcpy(&(_window_guest_list_groups_guest_faces[swap_position * 56]), temp_faces, 56);
 
             temp = _window_guest_list_group_index[swap_position];
diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp
index 45e7b37b8a..aa4dc60d03 100644
--- a/src/openrct2-ui/windows/InstallTrack.cpp
+++ b/src/openrct2-ui/windows/InstallTrack.cpp
@@ -437,12 +437,8 @@ static void window_install_track_design(rct_window* w)
         log_info("%s already exists, prompting user for a different track design name", destPath);
         context_show_error(STR_UNABLE_TO_INSTALL_THIS_TRACK_DESIGN, STR_NONE);
         window_text_input_raw_open(
-            w,
-            WIDX_INSTALL,
-            STR_SELECT_NEW_NAME_FOR_TRACK_DESIGN,
-            STR_AN_EXISTING_TRACK_DESIGN_ALREADY_HAS_THIS_NAME,
-            _trackName.c_str(),
-            255);
+            w, WIDX_INSTALL, STR_SELECT_NEW_NAME_FOR_TRACK_DESIGN, STR_AN_EXISTING_TRACK_DESIGN_ALREADY_HAS_THIS_NAME,
+            _trackName.c_str(), 255);
     }
     else
     {
diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp
index 89a494194a..859a0dd9a5 100644
--- a/src/openrct2-ui/windows/LandRights.cpp
+++ b/src/openrct2-ui/windows/LandRights.cpp
@@ -365,14 +365,10 @@ static void window_land_rights_tool_update_land_rights(int16_t x, int16_t y)
         return;
 
     _landRightsCost = game_do_command(
-        gMapSelectPositionA.x,
-        GAME_COMMAND_FLAG_2,
-        gMapSelectPositionA.y,
+        gMapSelectPositionA.x, GAME_COMMAND_FLAG_2, gMapSelectPositionA.y,
         (_landRightsMode == LAND_RIGHTS_MODE_BUY_LAND) ? BUY_LAND_RIGHTS_FLAG_BUY_LAND
                                                        : BUY_LAND_RIGHTS_FLAG_BUY_CONSTRUCTION_RIGHTS,
-        GAME_COMMAND_BUY_LAND_RIGHTS,
-        gMapSelectPositionB.x,
-        gMapSelectPositionB.y);
+        GAME_COMMAND_BUY_LAND_RIGHTS, gMapSelectPositionB.x, gMapSelectPositionB.y);
 }
 
 /**
@@ -413,13 +409,8 @@ static void window_land_rights_tooldown(rct_window* w, rct_widgetindex widgetInd
         {
             gGameCommandErrorTitle = STR_CANT_BUY_LAND;
             game_do_command(
-                gMapSelectPositionA.x,
-                GAME_COMMAND_FLAG_APPLY,
-                gMapSelectPositionA.y,
-                BUY_LAND_RIGHTS_FLAG_BUY_LAND,
-                GAME_COMMAND_BUY_LAND_RIGHTS,
-                gMapSelectPositionB.x,
-                gMapSelectPositionB.y);
+                gMapSelectPositionA.x, GAME_COMMAND_FLAG_APPLY, gMapSelectPositionA.y, BUY_LAND_RIGHTS_FLAG_BUY_LAND,
+                GAME_COMMAND_BUY_LAND_RIGHTS, gMapSelectPositionB.x, gMapSelectPositionB.y);
         }
     }
     else
@@ -428,12 +419,8 @@ static void window_land_rights_tooldown(rct_window* w, rct_widgetindex widgetInd
         {
             gGameCommandErrorTitle = STR_CANT_BUY_CONSTRUCTION_RIGHTS_HERE;
             game_do_command(
-                gMapSelectPositionA.x,
-                GAME_COMMAND_FLAG_APPLY,
-                gMapSelectPositionA.y,
-                BUY_LAND_RIGHTS_FLAG_BUY_CONSTRUCTION_RIGHTS,
-                GAME_COMMAND_BUY_LAND_RIGHTS,
-                gMapSelectPositionB.x,
+                gMapSelectPositionA.x, GAME_COMMAND_FLAG_APPLY, gMapSelectPositionA.y,
+                BUY_LAND_RIGHTS_FLAG_BUY_CONSTRUCTION_RIGHTS, GAME_COMMAND_BUY_LAND_RIGHTS, gMapSelectPositionB.x,
                 gMapSelectPositionB.y);
         }
     }
@@ -451,13 +438,8 @@ static void window_land_rights_tooldrag(rct_window* w, rct_widgetindex widgetInd
         {
             gGameCommandErrorTitle = STR_CANT_BUY_LAND;
             game_do_command(
-                gMapSelectPositionA.x,
-                GAME_COMMAND_FLAG_APPLY,
-                gMapSelectPositionA.y,
-                BUY_LAND_RIGHTS_FLAG_BUY_LAND,
-                GAME_COMMAND_BUY_LAND_RIGHTS,
-                gMapSelectPositionB.x,
-                gMapSelectPositionB.y);
+                gMapSelectPositionA.x, GAME_COMMAND_FLAG_APPLY, gMapSelectPositionA.y, BUY_LAND_RIGHTS_FLAG_BUY_LAND,
+                GAME_COMMAND_BUY_LAND_RIGHTS, gMapSelectPositionB.x, gMapSelectPositionB.y);
         }
     }
     else
@@ -466,12 +448,8 @@ static void window_land_rights_tooldrag(rct_window* w, rct_widgetindex widgetInd
         {
             gGameCommandErrorTitle = STR_CANT_BUY_CONSTRUCTION_RIGHTS_HERE;
             game_do_command(
-                gMapSelectPositionA.x,
-                GAME_COMMAND_FLAG_APPLY,
-                gMapSelectPositionA.y,
-                BUY_LAND_RIGHTS_FLAG_BUY_CONSTRUCTION_RIGHTS,
-                GAME_COMMAND_BUY_LAND_RIGHTS,
-                gMapSelectPositionB.x,
+                gMapSelectPositionA.x, GAME_COMMAND_FLAG_APPLY, gMapSelectPositionA.y,
+                BUY_LAND_RIGHTS_FLAG_BUY_CONSTRUCTION_RIGHTS, GAME_COMMAND_BUY_LAND_RIGHTS, gMapSelectPositionB.x,
                 gMapSelectPositionB.y);
         }
     }
diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp
index b64e1f4271..d7ca4a22c6 100644
--- a/src/openrct2-ui/windows/LoadSave.cpp
+++ b/src/openrct2-ui/windows/LoadSave.cpp
@@ -1097,13 +1097,7 @@ static rct_widget window_overwrite_prompt_widgets[] = {
     { WWT_CAPTION, 0, 1, OVERWRITE_WW - 2, 1, 14, STR_FILEBROWSER_OVERWRITE_TITLE, STR_WINDOW_TITLE_TIP },
     { WWT_CLOSEBOX, 0, OVERWRITE_WW - 13, OVERWRITE_WW - 3, 2, 13, STR_CLOSE_X, STR_CLOSE_WINDOW_TIP },
     { WWT_BUTTON, 0, 10, 94, OVERWRITE_WH - 20, OVERWRITE_WH - 9, STR_FILEBROWSER_OVERWRITE_TITLE, STR_NONE },
-    { WWT_BUTTON,
-      0,
-      OVERWRITE_WW - 95,
-      OVERWRITE_WW - 11,
-      OVERWRITE_WH - 20,
-      OVERWRITE_WH - 9,
-      STR_SAVE_PROMPT_CANCEL,
+    { WWT_BUTTON, 0, OVERWRITE_WW - 95, OVERWRITE_WW - 11, OVERWRITE_WH - 20, OVERWRITE_WH - 9, STR_SAVE_PROMPT_CANCEL,
       STR_NONE },
     { WIDGETS_END }
 };
diff --git a/src/openrct2-ui/windows/Main.cpp b/src/openrct2-ui/windows/Main.cpp
index db4250cac6..69f1d7b7b1 100644
--- a/src/openrct2-ui/windows/Main.cpp
+++ b/src/openrct2-ui/windows/Main.cpp
@@ -63,12 +63,7 @@ rct_window* window_main_open()
     window_main_widgets[0].right = context_get_width();
     window_main_widgets[0].bottom = context_get_height();
     rct_window* window = window_create(
-        0,
-        0,
-        window_main_widgets[0].right,
-        window_main_widgets[0].bottom,
-        &window_main_events,
-        WC_MAIN_WINDOW,
+        0, 0, window_main_widgets[0].right, window_main_widgets[0].bottom, &window_main_events, WC_MAIN_WINDOW,
         WF_STICK_TO_BACK);
     window->widgets = window_main_widgets;
 
diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp
index 4de20f1852..8360fdf6fb 100644
--- a/src/openrct2-ui/windows/Map.cpp
+++ b/src/openrct2-ui/windows/Map.cpp
@@ -508,13 +508,8 @@ static void window_map_tooldrag(rct_window* w, rct_widgetindex widgetIndex, int3
             {
                 gGameCommandErrorTitle = 0;
                 game_do_command(
-                    gMapSelectPositionA.x,
-                    GAME_COMMAND_FLAG_APPLY,
-                    gMapSelectPositionA.y,
-                    _activeTool,
-                    GAME_COMMAND_SET_LAND_OWNERSHIP,
-                    gMapSelectPositionB.x,
-                    gMapSelectPositionB.y);
+                    gMapSelectPositionA.x, GAME_COMMAND_FLAG_APPLY, gMapSelectPositionA.y, _activeTool,
+                    GAME_COMMAND_SET_LAND_OWNERSHIP, gMapSelectPositionB.x, gMapSelectPositionB.y);
             }
             break;
     }
@@ -599,12 +594,8 @@ static void window_map_scrollmousedown(rct_window* w, int32_t scrollIndex, int32
 
         gGameCommandErrorTitle = STR_CANT_CHANGE_LAND_TYPE;
         game_do_command(
-            gMapSelectPositionA.x,
-            GAME_COMMAND_FLAG_APPLY,
-            gMapSelectPositionA.y,
-            gLandToolTerrainSurface | (gLandToolTerrainEdge << 8),
-            GAME_COMMAND_CHANGE_SURFACE_STYLE,
-            gMapSelectPositionB.x,
+            gMapSelectPositionA.x, GAME_COMMAND_FLAG_APPLY, gMapSelectPositionA.y,
+            gLandToolTerrainSurface | (gLandToolTerrainEdge << 8), GAME_COMMAND_CHANGE_SURFACE_STYLE, gMapSelectPositionB.x,
             gMapSelectPositionB.y);
     }
     else if (widget_is_active_tool(w, WIDX_SET_LAND_RIGHTS))
@@ -627,13 +618,8 @@ static void window_map_scrollmousedown(rct_window* w, int32_t scrollIndex, int32
 
         gGameCommandErrorTitle = 0;
         game_do_command(
-            gMapSelectPositionA.x,
-            GAME_COMMAND_FLAG_APPLY,
-            gMapSelectPositionA.y,
-            _activeTool,
-            GAME_COMMAND_SET_LAND_OWNERSHIP,
-            gMapSelectPositionB.x,
-            gMapSelectPositionB.y);
+            gMapSelectPositionA.x, GAME_COMMAND_FLAG_APPLY, gMapSelectPositionA.y, _activeTool, GAME_COMMAND_SET_LAND_OWNERSHIP,
+            gMapSelectPositionB.x, gMapSelectPositionB.y);
     }
 }
 
@@ -850,11 +836,8 @@ static void window_map_paint(rct_window* w, rct_drawpixelinfo* dpi)
         x = w->x + w->widgets[WIDX_PEOPLE_STARTING_POSITION].left + 12;
         y = w->y + w->widgets[WIDX_PEOPLE_STARTING_POSITION].top + 18;
         gfx_draw_sprite(
-            dpi,
-            IMAGE_TYPE_REMAP | IMAGE_TYPE_REMAP_2_PLUS | (COLOUR_LIGHT_BROWN << 24) | (COLOUR_BRIGHT_RED << 19) | SPR_6410,
-            x,
-            y,
-            0);
+            dpi, IMAGE_TYPE_REMAP | IMAGE_TYPE_REMAP_2_PLUS | (COLOUR_LIGHT_BROWN << 24) | (COLOUR_BRIGHT_RED << 19) | SPR_6410,
+            x, y, 0);
     }
 
     if (!(gScreenFlags & SCREEN_FLAGS_SCENARIO_EDITOR) && !gCheatsSandboxMode)
diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp
index 5f20ce5275..ae96e0e199 100644
--- a/src/openrct2-ui/windows/MapGen.cpp
+++ b/src/openrct2-ui/windows/MapGen.cpp
@@ -761,29 +761,17 @@ static void window_mapgen_base_paint(rct_window* w, rct_drawpixelinfo* dpi)
     // The practical map size is 2 lower than the technical map size
     LocationXY16 mapSizeArgs = MakeXY16(_mapSize - 2, _mapSize - 2);
     gfx_draw_string_left(
-        dpi,
-        STR_RESOLUTION_X_BY_Y,
-        &mapSizeArgs,
-        w->colours[1],
-        w->x + w->widgets[WIDX_MAP_SIZE].left + 1,
+        dpi, STR_RESOLUTION_X_BY_Y, &mapSizeArgs, w->colours[1], w->x + w->widgets[WIDX_MAP_SIZE].left + 1,
         w->y + w->widgets[WIDX_MAP_SIZE].top + 1);
 
     arg = (_baseHeight - 12) / 2;
     gfx_draw_string_left(
-        dpi,
-        STR_COMMA16,
-        &arg,
-        w->colours[1],
-        w->x + w->widgets[WIDX_BASE_HEIGHT].left + 1,
+        dpi, STR_COMMA16, &arg, w->colours[1], w->x + w->widgets[WIDX_BASE_HEIGHT].left + 1,
         w->y + w->widgets[WIDX_BASE_HEIGHT].top + 1);
 
     arg = (_waterLevel - 12) / 2;
     gfx_draw_string_left(
-        dpi,
-        STR_COMMA16,
-        &arg,
-        w->colours[1],
-        w->x + w->widgets[WIDX_WATER_LEVEL].left + 1,
+        dpi, STR_COMMA16, &arg, w->colours[1], w->x + w->widgets[WIDX_WATER_LEVEL].left + 1,
         w->y + w->widgets[WIDX_WATER_LEVEL].top + 1);
 }
 
@@ -1062,11 +1050,7 @@ static void window_mapgen_simplex_paint(rct_window* w, rct_drawpixelinfo* dpi)
     gfx_draw_string_left(
         dpi, STR_MAPGEN_SIMPLEX_NOISE_HIGH, nullptr, textColour, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_HIGH].top + 1);
     gfx_draw_string_left(
-        dpi,
-        STR_MAPGEN_SIMPLEX_NOISE_BASE_FREQUENCY,
-        nullptr,
-        textColour,
-        w->x + 5,
+        dpi, STR_MAPGEN_SIMPLEX_NOISE_BASE_FREQUENCY, nullptr, textColour, w->x + 5,
         w->y + w->widgets[WIDX_SIMPLEX_BASE_FREQ].top + 1);
     gfx_draw_string_left(
         dpi, STR_MAPGEN_SIMPLEX_NOISE_OCTAVES, nullptr, textColour, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_OCTAVES].top + 1);
@@ -1075,60 +1059,32 @@ static void window_mapgen_simplex_paint(rct_window* w, rct_drawpixelinfo* dpi)
         dpi, STR_WATER_LEVEL_LABEL, nullptr, textColour, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_WATER_LEVEL].top + 1);
 
     gfx_draw_string_left(
-        dpi,
-        STR_COMMA16,
-        &_simplex_low,
-        textColour,
-        w->x + w->widgets[WIDX_SIMPLEX_LOW].left + 1,
+        dpi, STR_COMMA16, &_simplex_low, textColour, w->x + w->widgets[WIDX_SIMPLEX_LOW].left + 1,
         w->y + w->widgets[WIDX_SIMPLEX_LOW].top + 1);
     gfx_draw_string_left(
-        dpi,
-        STR_COMMA16,
-        &_simplex_high,
-        textColour,
-        w->x + w->widgets[WIDX_SIMPLEX_HIGH].left + 1,
+        dpi, STR_COMMA16, &_simplex_high, textColour, w->x + w->widgets[WIDX_SIMPLEX_HIGH].left + 1,
         w->y + w->widgets[WIDX_SIMPLEX_HIGH].top + 1);
     gfx_draw_string_left(
-        dpi,
-        STR_WINDOW_OBJECTIVE_VALUE_RATING,
-        &_simplex_base_freq,
-        textColour,
-        w->x + w->widgets[WIDX_SIMPLEX_BASE_FREQ].left + 1,
-        w->y + w->widgets[WIDX_SIMPLEX_BASE_FREQ].top + 1);
+        dpi, STR_WINDOW_OBJECTIVE_VALUE_RATING, &_simplex_base_freq, textColour,
+        w->x + w->widgets[WIDX_SIMPLEX_BASE_FREQ].left + 1, w->y + w->widgets[WIDX_SIMPLEX_BASE_FREQ].top + 1);
     gfx_draw_string_left(
-        dpi,
-        STR_COMMA16,
-        &_simplex_octaves,
-        textColour,
-        w->x + w->widgets[WIDX_SIMPLEX_OCTAVES].left + 1,
+        dpi, STR_COMMA16, &_simplex_octaves, textColour, w->x + w->widgets[WIDX_SIMPLEX_OCTAVES].left + 1,
         w->y + w->widgets[WIDX_SIMPLEX_OCTAVES].top + 1);
     gfx_draw_string_left(
         dpi, STR_TERRAIN_LABEL, nullptr, textColour, w->x + 5, w->y + w->widgets[WIDX_SIMPLEX_RANDOM_TERRAIN_CHECKBOX].top + 1);
     gfx_draw_string_left(
-        dpi,
-        STR_MAPGEN_OPTION_PLACE_TREES,
-        nullptr,
-        textColour,
-        w->x + 5,
+        dpi, STR_MAPGEN_OPTION_PLACE_TREES, nullptr, textColour, w->x + 5,
         w->y + w->widgets[WIDX_SIMPLEX_PLACE_TREES_CHECKBOX].top + 1);
 
     // The practical map size is 2 lower than the technical map size
     LocationXY16 mapSizeArgs = MakeXY16(_mapSize - 2, _mapSize - 2);
     gfx_draw_string_left(
-        dpi,
-        STR_RESOLUTION_X_BY_Y,
-        &mapSizeArgs,
-        textColour,
-        w->x + w->widgets[WIDX_SIMPLEX_MAP_SIZE].left + 1,
+        dpi, STR_RESOLUTION_X_BY_Y, &mapSizeArgs, textColour, w->x + w->widgets[WIDX_SIMPLEX_MAP_SIZE].left + 1,
         w->y + w->widgets[WIDX_SIMPLEX_MAP_SIZE].top + 1);
 
     arg = (_waterLevel - 12) / 2;
     gfx_draw_string_left(
-        dpi,
-        STR_COMMA16,
-        &arg,
-        textColour,
-        w->x + w->widgets[WIDX_SIMPLEX_WATER_LEVEL].left + 1,
+        dpi, STR_COMMA16, &arg, textColour, w->x + w->widgets[WIDX_SIMPLEX_WATER_LEVEL].left + 1,
         w->y + w->widgets[WIDX_SIMPLEX_WATER_LEVEL].top + 1);
 }
 
@@ -1286,11 +1242,7 @@ static void window_mapgen_heightmap_paint(rct_window* w, rct_drawpixelinfo* dpi)
     gfx_draw_string_left(
         dpi, STR_MAPGEN_SMOOTH_STRENGTH, nullptr, strengthColour, w->x + 5, w->y + w->widgets[WIDX_HEIGHTMAP_STRENGTH].top + 1);
     gfx_draw_string_left(
-        dpi,
-        STR_COMMA16,
-        &strength,
-        strengthColour,
-        w->x + w->widgets[WIDX_HEIGHTMAP_STRENGTH].left + 1,
+        dpi, STR_COMMA16, &strength, strengthColour, w->x + w->widgets[WIDX_HEIGHTMAP_STRENGTH].left + 1,
         w->y + w->widgets[WIDX_HEIGHTMAP_STRENGTH].top + 1);
 
     // Low label and value
@@ -1299,11 +1251,7 @@ static void window_mapgen_heightmap_paint(rct_window* w, rct_drawpixelinfo* dpi)
     gfx_draw_string_left(
         dpi, STR_MAPGEN_SIMPLEX_NOISE_LOW_, nullptr, labelColour, w->x + 5, w->y + w->widgets[WIDX_HEIGHTMAP_LOW].top + 1);
     gfx_draw_string_left(
-        dpi,
-        STR_COMMA16,
-        &low,
-        labelColour,
-        w->x + w->widgets[WIDX_HEIGHTMAP_LOW].left + 1,
+        dpi, STR_COMMA16, &low, labelColour, w->x + w->widgets[WIDX_HEIGHTMAP_LOW].left + 1,
         w->y + w->widgets[WIDX_HEIGHTMAP_LOW].top + 1);
 
     // High label and value
@@ -1311,11 +1259,7 @@ static void window_mapgen_heightmap_paint(rct_window* w, rct_drawpixelinfo* dpi)
     gfx_draw_string_left(
         dpi, STR_MAPGEN_SIMPLEX_NOISE_HIGH, nullptr, labelColour, w->x + 5, w->y + w->widgets[WIDX_HEIGHTMAP_HIGH].top + 1);
     gfx_draw_string_left(
-        dpi,
-        STR_COMMA16,
-        &high,
-        labelColour,
-        w->x + w->widgets[WIDX_HEIGHTMAP_HIGH].left + 1,
+        dpi, STR_COMMA16, &high, labelColour, w->x + w->widgets[WIDX_HEIGHTMAP_HIGH].left + 1,
         w->y + w->widgets[WIDX_HEIGHTMAP_HIGH].top + 1);
 
     // Water level label and value
@@ -1323,11 +1267,7 @@ static void window_mapgen_heightmap_paint(rct_window* w, rct_drawpixelinfo* dpi)
     gfx_draw_string_left(
         dpi, STR_WATER_LEVEL_LABEL, nullptr, labelColour, w->x + 5, w->y + w->widgets[WIDX_HEIGHTMAP_WATER_LEVEL].top + 1);
     gfx_draw_string_left(
-        dpi,
-        STR_COMMA16,
-        &waterLevel,
-        labelColour,
-        w->x + w->widgets[WIDX_HEIGHTMAP_WATER_LEVEL].left + 1,
+        dpi, STR_COMMA16, &waterLevel, labelColour, w->x + w->widgets[WIDX_HEIGHTMAP_WATER_LEVEL].left + 1,
         w->y + w->widgets[WIDX_HEIGHTMAP_WATER_LEVEL].top + 1);
 }
 
diff --git a/src/openrct2-ui/windows/MapTooltip.cpp b/src/openrct2-ui/windows/MapTooltip.cpp
index 778b5a2755..f552ec8399 100644
--- a/src/openrct2-ui/windows/MapTooltip.cpp
+++ b/src/openrct2-ui/windows/MapTooltip.cpp
@@ -128,12 +128,7 @@ static void window_map_tooltip_open()
     if (w == nullptr)
     {
         w = window_create(
-            x,
-            y,
-            width,
-            height,
-            &window_map_tooltip_events,
-            WC_MAP_TOOLTIP,
+            x, y, width, height, &window_map_tooltip_events, WC_MAP_TOOLTIP,
             WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_BACKGROUND);
         w->widgets = window_map_tooltip_widgets;
     }
@@ -170,11 +165,6 @@ static void window_map_tooltip_paint(rct_window* w, rct_drawpixelinfo* dpi)
     }
 
     gfx_draw_string_centred_wrapped(
-        dpi,
-        gMapTooltipFormatArgs,
-        w->x + (w->width / 2),
-        w->y + (w->height / 2),
-        w->width,
-        STR_MAP_TOOLTIP_STRINGID,
+        dpi, gMapTooltipFormatArgs, w->x + (w->width / 2), w->y + (w->height / 2), w->width, STR_MAP_TOOLTIP_STRINGID,
         COLOUR_BLACK);
 }
diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp
index d5566dbf1e..c7f0685276 100644
--- a/src/openrct2-ui/windows/MazeConstruction.cpp
+++ b/src/openrct2-ui/windows/MazeConstruction.cpp
@@ -376,13 +376,8 @@ static void window_maze_construction_entrance_tooldown(int32_t x, int32_t y, rct
     }
 
     money32 cost = game_do_command(
-        x,
-        GAME_COMMAND_FLAG_APPLY | ((direction ^ 2) << 8),
-        y,
-        rideIndex | (entranceExitType << 8),
-        GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT,
-        gRideEntranceExitPlaceStationIndex,
-        0);
+        x, GAME_COMMAND_FLAG_APPLY | ((direction ^ 2) << 8), y, rideIndex | (entranceExitType << 8),
+        GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT, gRideEntranceExitPlaceStationIndex, 0);
 
     if (cost == MONEY32_UNDEFINED)
         return;
diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp
index f9d295b312..254a996f89 100644
--- a/src/openrct2-ui/windows/Multiplayer.cpp
+++ b/src/openrct2-ui/windows/Multiplayer.cpp
@@ -365,14 +365,8 @@ static void window_multiplayer_groups_show_group_dropdown(rct_window* w, rct_wid
     numItems = network_get_num_groups();
 
     window_dropdown_show_text_custom_width(
-        w->x + dropdownWidget->left,
-        w->y + dropdownWidget->top,
-        dropdownWidget->bottom - dropdownWidget->top + 1,
-        w->colours[1],
-        0,
-        0,
-        numItems,
-        widget->right - dropdownWidget->left);
+        w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+        w->colours[1], 0, 0, numItems, widget->right - dropdownWidget->left);
 
     for (i = 0; i < network_get_num_groups(); i++)
     {
@@ -766,12 +760,7 @@ static void window_multiplayer_groups_dropdown(rct_window* w, rct_widgetindex wi
     {
         case WIDX_DEFAULT_GROUP_DROPDOWN:
             game_do_command(
-                4 | (network_get_group_id(dropdownIndex) << 8),
-                GAME_COMMAND_FLAG_APPLY,
-                0,
-                0,
-                GAME_COMMAND_MODIFY_GROUPS,
-                0,
+                4 | (network_get_group_id(dropdownIndex) << 8), GAME_COMMAND_FLAG_APPLY, 0, 0, GAME_COMMAND_MODIFY_GROUPS, 0,
                 0);
             break;
         case WIDX_SELECTED_GROUP_DROPDOWN:
@@ -844,29 +833,14 @@ static void window_multiplayer_groups_text_input(rct_window* w, rct_widgetindex
         return;
 
     game_do_command(
-        3 | (_selectedGroup << 8) | (1 << 16),
-        GAME_COMMAND_FLAG_APPLY,
-        w->number,
-        *((int32_t*)(text + 0)),
-        GAME_COMMAND_MODIFY_GROUPS,
-        *((int32_t*)(text + 8)),
-        *((int32_t*)(text + 4)));
+        3 | (_selectedGroup << 8) | (1 << 16), GAME_COMMAND_FLAG_APPLY, w->number, *((int32_t*)(text + 0)),
+        GAME_COMMAND_MODIFY_GROUPS, *((int32_t*)(text + 8)), *((int32_t*)(text + 4)));
     game_do_command(
-        3 | (_selectedGroup << 8) | (2 << 16),
-        GAME_COMMAND_FLAG_APPLY,
-        w->number,
-        *((int32_t*)(text + 12)),
-        GAME_COMMAND_MODIFY_GROUPS,
-        *((int32_t*)(text + 20)),
-        *((int32_t*)(text + 16)));
+        3 | (_selectedGroup << 8) | (2 << 16), GAME_COMMAND_FLAG_APPLY, w->number, *((int32_t*)(text + 12)),
+        GAME_COMMAND_MODIFY_GROUPS, *((int32_t*)(text + 20)), *((int32_t*)(text + 16)));
     game_do_command(
-        3 | (_selectedGroup << 8) | (0 << 16),
-        GAME_COMMAND_FLAG_APPLY,
-        w->number,
-        *((int32_t*)(text + 24)),
-        GAME_COMMAND_MODIFY_GROUPS,
-        *((int32_t*)(text + 32)),
-        *((int32_t*)(text + 28)));
+        3 | (_selectedGroup << 8) | (0 << 16), GAME_COMMAND_FLAG_APPLY, w->number, *((int32_t*)(text + 24)),
+        GAME_COMMAND_MODIFY_GROUPS, *((int32_t*)(text + 32)), *((int32_t*)(text + 28)));
 }
 
 static void window_multiplayer_groups_invalidate(rct_window* w)
@@ -900,13 +874,8 @@ static void window_multiplayer_groups_paint(rct_window* w, rct_drawpixelinfo* dp
         safe_strcpy(lineCh, network_get_group_name(group), sizeof(buffer) - (lineCh - buffer));
         set_format_arg(0, const char*, buffer);
         gfx_draw_string_centred_clipped(
-            dpi,
-            STR_STRING,
-            gCommonFormatArgs,
-            COLOUR_BLACK,
-            w->x + (widget->left + widget->right - 11) / 2,
-            w->y + widget->top,
-            widget->right - widget->left - 8);
+            dpi, STR_STRING, gCommonFormatArgs, COLOUR_BLACK, w->x + (widget->left + widget->right - 11) / 2,
+            w->y + widget->top, widget->right - widget->left - 8);
     }
 
     int32_t x = w->x + window_multiplayer_groups_widgets[WIDX_CONTENT_PANEL].left + 4;
@@ -929,13 +898,8 @@ static void window_multiplayer_groups_paint(rct_window* w, rct_drawpixelinfo* dp
         safe_strcpy(lineCh, network_get_group_name(group), sizeof(buffer) - (lineCh - buffer));
         set_format_arg(0, const char*, buffer);
         gfx_draw_string_centred_clipped(
-            dpi,
-            STR_STRING,
-            gCommonFormatArgs,
-            COLOUR_BLACK,
-            w->x + (widget->left + widget->right - 11) / 2,
-            w->y + widget->top,
-            widget->right - widget->left - 8);
+            dpi, STR_STRING, gCommonFormatArgs, COLOUR_BLACK, w->x + (widget->left + widget->right - 11) / 2,
+            w->y + widget->top, widget->right - widget->left - 8);
     }
 }
 
diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp
index 9e30fd10c4..bd1979083b 100644
--- a/src/openrct2-ui/windows/NewCampaign.cpp
+++ b/src/openrct2-ui/windows/NewCampaign.cpp
@@ -276,13 +276,8 @@ static void window_new_campaign_mousedown(rct_window* w, rct_widgetindex widgetI
                     }
 
                     window_dropdown_show_text_custom_width(
-                        w->x + dropdownWidget->left,
-                        w->y + dropdownWidget->top,
-                        dropdownWidget->bottom - dropdownWidget->top + 1,
-                        w->colours[1],
-                        0,
-                        DROPDOWN_FLAG_STAY_OPEN,
-                        numItems,
+                        w->x + dropdownWidget->left, w->y + dropdownWidget->top,
+                        dropdownWidget->bottom - dropdownWidget->top + 1, w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, numItems,
                         dropdownWidget->right - dropdownWidget->left - 3);
                 }
             }
@@ -301,14 +296,8 @@ static void window_new_campaign_mousedown(rct_window* w, rct_widgetindex widgetI
                 }
 
                 window_dropdown_show_text_custom_width(
-                    w->x + dropdownWidget->left,
-                    w->y + dropdownWidget->top,
-                    dropdownWidget->bottom - dropdownWidget->top + 1,
-                    w->colours[1],
-                    0,
-                    DROPDOWN_FLAG_STAY_OPEN,
-                    numItems,
-                    dropdownWidget->right - dropdownWidget->left - 3);
+                    w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+                    w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, numItems, dropdownWidget->right - dropdownWidget->left - 3);
             }
             break;
         // In RCT2, the maximum was 6 weeks
@@ -406,12 +395,8 @@ static void window_new_campaign_paint(rct_window* w, rct_drawpixelinfo* dpi)
     // Number of weeks
     rct_widget* spinnerWidget = &window_new_campaign_widgets[WIDX_WEEKS_SPINNER];
     gfx_draw_string_left(
-        dpi,
-        w->campaign.no_weeks == 1 ? STR_MARKETING_1_WEEK : STR_X_WEEKS,
-        &w->campaign.no_weeks,
-        w->colours[0],
-        w->x + spinnerWidget->left + 1,
-        w->y + spinnerWidget->top);
+        dpi, w->campaign.no_weeks == 1 ? STR_MARKETING_1_WEEK : STR_X_WEEKS, &w->campaign.no_weeks, w->colours[0],
+        w->x + spinnerWidget->left + 1, w->y + spinnerWidget->top);
 
     x = w->x + 14;
     y = w->y + 60;
diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp
index 8883095022..2ee9ffe24f 100644
--- a/src/openrct2-ui/windows/Options.cpp
+++ b/src/openrct2-ui/windows/Options.cpp
@@ -1248,14 +1248,8 @@ static void window_options_mousedown(rct_window* w, rct_widgetindex widgetIndex,
                     }
 
                     window_dropdown_show_text_custom_width(
-                        w->x + widget->left,
-                        w->y + widget->top,
-                        widget->bottom - widget->top + 1,
-                        w->colours[1],
-                        0,
-                        DROPDOWN_FLAG_STAY_OPEN,
-                        num_items,
-                        widget->right - widget->left - 3);
+                        w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0,
+                        DROPDOWN_FLAG_STAY_OPEN, num_items, widget->right - widget->left - 3);
 
                     dropdown_set_checked((int32_t)theme_manager_get_active_available_theme_index(), true);
                     widget_invalidate(w, WIDX_THEMES_DROPDOWN);
@@ -1275,12 +1269,8 @@ static void window_options_mousedown(rct_window* w, rct_widgetindex widgetIndex,
                     }
 
                     window_dropdown_show_text(
-                        w->x + widget->left,
-                        w->y + widget->top,
-                        widget->bottom - widget->top + 1,
-                        w->colours[1],
-                        DROPDOWN_FLAG_STAY_OPEN,
-                        num_items);
+                        w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1],
+                        DROPDOWN_FLAG_STAY_OPEN, num_items);
 
                     dropdown_set_checked((int32_t)title_get_current_sequence(), true);
                     break;
@@ -1293,14 +1283,8 @@ static void window_options_mousedown(rct_window* w, rct_widgetindex widgetIndex,
                     gDropdownItemsArgs[1] = STR_OPTIONS_SCENARIO_ORIGIN;
 
                     window_dropdown_show_text_custom_width(
-                        w->x + widget->left,
-                        w->y + widget->top,
-                        widget->bottom - widget->top + 1,
-                        w->colours[1],
-                        0,
-                        DROPDOWN_FLAG_STAY_OPEN,
-                        num_items,
-                        widget->right - widget->left - 3);
+                        w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0,
+                        DROPDOWN_FLAG_STAY_OPEN, num_items, widget->right - widget->left - 3);
 
                     dropdown_set_checked(gConfigGeneral.scenario_select_mode, true);
                     break;
@@ -1699,8 +1683,7 @@ static void window_options_invalidate(rct_window* w)
             widget_set_checkbox_value(w, WIDX_SHOW_GUEST_PURCHASES_CHECKBOX, gConfigGeneral.show_guest_purchases);
             widget_set_checkbox_value(w, WIDX_UPPER_CASE_BANNERS_CHECKBOX, gConfigGeneral.upper_case_banners);
 
-            rct_string_id VirtualFloorStyleStrings[] = { STR_VIRTUAL_FLOOR_STYLE_DISABLED,
-                                                         STR_VIRTUAL_FLOOR_STYLE_TRANSPARENT,
+            rct_string_id VirtualFloorStyleStrings[] = { STR_VIRTUAL_FLOOR_STYLE_DISABLED, STR_VIRTUAL_FLOOR_STYLE_TRANSPARENT,
                                                          STR_VIRTUAL_FLOOR_STYLE_GLASSY };
 
             window_options_rendering_widgets[WIDX_VIRTUAL_FLOOR].text = VirtualFloorStyleStrings[gConfigGeneral
@@ -1718,8 +1701,7 @@ static void window_options_invalidate(rct_window* w)
             }
 
             widget_set_checkbox_value(
-                w,
-                WIDX_RENDER_WEATHER_EFFECTS_CHECKBOX,
+                w, WIDX_RENDER_WEATHER_EFFECTS_CHECKBOX,
                 gConfigGeneral.render_weather_effects || gConfigGeneral.render_weather_gloom);
             widget_set_checkbox_value(w, WIDX_DISABLE_LIGHTNING_EFFECT_CHECKBOX, gConfigGeneral.disable_lightning_effect);
             if (!gConfigGeneral.render_weather_effects && !gConfigGeneral.render_weather_gloom)
@@ -1957,11 +1939,7 @@ static void window_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
         case WINDOW_OPTIONS_PAGE_DISPLAY:
         {
             gfx_draw_string_left(
-                dpi,
-                STR_FULLSCREEN_MODE,
-                w,
-                w->colours[1],
-                w->x + 10,
+                dpi, STR_FULLSCREEN_MODE, w, w->colours[1], w->x + 10,
                 w->y + window_options_display_widgets[WIDX_FULLSCREEN].top + 1);
 
             // Disable resolution dropdown on "Windowed" and "Fullscreen (desktop)"
@@ -1971,35 +1949,19 @@ static void window_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
                 colour |= COLOUR_FLAG_INSET;
             }
             gfx_draw_string_left(
-                dpi,
-                STR_DISPLAY_RESOLUTION,
-                w,
-                colour,
-                w->x + 10 + 15,
+                dpi, STR_DISPLAY_RESOLUTION, w, colour, w->x + 10 + 15,
                 w->y + window_options_display_widgets[WIDX_RESOLUTION].top + 1);
 
             gfx_draw_string_left(
-                dpi,
-                STR_UI_SCALING_DESC,
-                w,
-                w->colours[1],
-                w->x + 10,
+                dpi, STR_UI_SCALING_DESC, w, w->colours[1], w->x + 10,
                 w->y + window_options_display_widgets[WIDX_SCALE].top + 1);
             gfx_draw_string_left(
-                dpi,
-                STR_DRAWING_ENGINE,
-                w,
-                w->colours[1],
-                w->x + 10,
+                dpi, STR_DRAWING_ENGINE, w, w->colours[1], w->x + 10,
                 w->y + window_options_display_widgets[WIDX_DRAWING_ENGINE].top + 1);
 
             int32_t scale = (int32_t)(gConfigGeneral.window_scale * 100);
             gfx_draw_string_left(
-                dpi,
-                STR_WINDOW_OBJECTIVE_VALUE_RATING,
-                &scale,
-                w->colours[1],
-                w->x + w->widgets[WIDX_SCALE].left + 1,
+                dpi, STR_WINDOW_OBJECTIVE_VALUE_RATING, &scale, w->colours[1], w->x + w->widgets[WIDX_SCALE].left + 1,
                 w->y + w->widgets[WIDX_SCALE].top + 1);
 
             colour = w->colours[1];
@@ -2009,70 +1971,38 @@ static void window_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
                 colour |= COLOUR_FLAG_INSET;
             }
             gfx_draw_string_left(
-                dpi,
-                STR_SCALING_QUALITY,
-                w,
-                colour,
-                w->x + 25,
+                dpi, STR_SCALING_QUALITY, w, colour, w->x + 25,
                 w->y + window_options_display_widgets[WIDX_SCALE_QUALITY].top + 1);
             break;
         }
 
         case WINDOW_OPTIONS_PAGE_CULTURE:
             gfx_draw_string_left(
-                dpi,
-                STR_OPTIONS_LANGUAGE,
-                w,
-                w->colours[1],
-                w->x + 10,
+                dpi, STR_OPTIONS_LANGUAGE, w, w->colours[1], w->x + 10,
                 w->y + window_options_culture_widgets[WIDX_LANGUAGE].top + 1);
             gfx_draw_string_left(
                 dpi, STR_CURRENCY, w, w->colours[1], w->x + 10, w->y + window_options_culture_widgets[WIDX_CURRENCY].top + 1);
             gfx_draw_string_left(
-                dpi,
-                STR_DISTANCE_AND_SPEED,
-                w,
-                w->colours[1],
-                w->x + 10,
+                dpi, STR_DISTANCE_AND_SPEED, w, w->colours[1], w->x + 10,
                 w->y + window_options_culture_widgets[WIDX_DISTANCE].top + 1);
             gfx_draw_string_left(
-                dpi,
-                STR_TEMPERATURE,
-                w,
-                w->colours[1],
-                w->x + 10,
+                dpi, STR_TEMPERATURE, w, w->colours[1], w->x + 10,
                 w->y + window_options_culture_widgets[WIDX_TEMPERATURE].top + 1);
             gfx_draw_string_left(
-                dpi,
-                STR_HEIGHT_LABELS,
-                w,
-                w->colours[1],
-                w->x + 10,
+                dpi, STR_HEIGHT_LABELS, w, w->colours[1], w->x + 10,
                 w->y + window_options_culture_widgets[WIDX_HEIGHT_LABELS].top + 1);
             gfx_draw_string_left(
-                dpi,
-                STR_DATE_FORMAT,
-                w,
-                w->colours[1],
-                w->x + 10,
+                dpi, STR_DATE_FORMAT, w, w->colours[1], w->x + 10,
                 w->y + window_options_culture_widgets[WIDX_DATE_FORMAT].top + 1);
             break;
 
         case WINDOW_OPTIONS_PAGE_CONTROLS_AND_INTERFACE:
         {
             gfx_draw_string_left(
-                dpi,
-                STR_SHOW_TOOLBAR_BUTTONS_FOR,
-                w,
-                w->colours[1],
-                w->x + 10,
+                dpi, STR_SHOW_TOOLBAR_BUTTONS_FOR, w, w->colours[1], w->x + 10,
                 w->y + window_options_controls_and_interface_widgets[WIDX_TOOLBAR_BUTTONS_GROUP].top + 15);
             gfx_draw_string_left(
-                dpi,
-                STR_THEMES_LABEL_CURRENT_THEME,
-                nullptr,
-                w->colours[1],
-                w->x + 10,
+                dpi, STR_THEMES_LABEL_CURRENT_THEME, nullptr, w->colours[1], w->x + 10,
                 w->y + window_options_controls_and_interface_widgets[WIDX_THEMES].top + 1);
             break;
         }
@@ -2080,25 +2010,13 @@ static void window_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
         case WINDOW_OPTIONS_PAGE_MISC:
         {
             gfx_draw_string_left(
-                dpi,
-                STR_TITLE_SEQUENCE,
-                w,
-                w->colours[1],
-                w->x + 10,
+                dpi, STR_TITLE_SEQUENCE, w, w->colours[1], w->x + 10,
                 w->y + window_options_misc_widgets[WIDX_TITLE_SEQUENCE].top + 1);
             gfx_draw_string_left(
-                dpi,
-                STR_OPTIONS_SCENARIO_GROUPING,
-                nullptr,
-                w->colours[1],
-                w->x + 10,
+                dpi, STR_OPTIONS_SCENARIO_GROUPING, nullptr, w->colours[1], w->x + 10,
                 w->y + window_options_misc_widgets[WIDX_SCENARIO_GROUPING].top + 1);
             gfx_draw_string_left(
-                dpi,
-                STR_DEFAULT_INSPECTION_INTERVAL,
-                w,
-                w->colours[1],
-                w->x + 10,
+                dpi, STR_DEFAULT_INSPECTION_INTERVAL, w, w->colours[1], w->x + 10,
                 w->y + window_options_misc_widgets[WIDX_DEFAULT_INSPECTION_INTERVAL].top + 1);
             break;
         }
@@ -2106,17 +2024,10 @@ static void window_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
         case WINDOW_OPTIONS_PAGE_ADVANCED:
         {
             gfx_draw_string_left(
-                dpi,
-                STR_OPTIONS_AUTOSAVE_FREQUENCY_LABEL,
-                w,
-                w->colours[1],
-                w->x + 24,
+                dpi, STR_OPTIONS_AUTOSAVE_FREQUENCY_LABEL, w, w->colours[1], w->x + 24,
                 w->y + window_options_advanced_widgets[WIDX_AUTOSAVE].top + 1);
             gfx_draw_string_left(
-                dpi,
-                window_options_autosave_names[gConfigGeneral.autosave_frequency],
-                nullptr,
-                w->colours[1],
+                dpi, window_options_autosave_names[gConfigGeneral.autosave_frequency], nullptr, w->colours[1],
                 w->x + window_options_advanced_widgets[WIDX_AUTOSAVE].left + 1,
                 w->y + window_options_advanced_widgets[WIDX_AUTOSAVE].top);
 
@@ -2134,12 +2045,7 @@ static void window_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
             uint32_t padding = widgetHeight > lineHeight ? (widgetHeight - lineHeight) / 2 : 0;
 
             gfx_draw_string_left_clipped(
-                dpi,
-                STR_STRING,
-                gCommonFormatArgs,
-                w->colours[1],
-                w->x + pathWidget.left + 1,
-                w->y + pathWidget.top + padding,
+                dpi, STR_STRING, gCommonFormatArgs, w->colours[1], w->x + pathWidget.left + 1, w->y + pathWidget.top + padding,
                 277);
             break;
         }
@@ -2150,14 +2056,8 @@ static void window_options_paint(rct_window* w, rct_drawpixelinfo* dpi)
 static void window_options_show_dropdown(rct_window* w, rct_widget* widget, int32_t num_items)
 {
     window_dropdown_show_text_custom_width(
-        w->x + widget->left,
-        w->y + widget->top,
-        widget->bottom - widget->top + 1,
-        w->colours[1],
-        0,
-        DROPDOWN_FLAG_STAY_OPEN,
-        num_items,
-        widget->right - widget->left - 3);
+        w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN,
+        num_items, widget->right - widget->left - 3);
 }
 
 static void window_options_update_height_markers()
diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp
index 1dfdca998e..bfe236e6b5 100644
--- a/src/openrct2-ui/windows/Park.cpp
+++ b/src/openrct2-ui/windows/Park.cpp
@@ -861,13 +861,8 @@ static void window_park_entrance_paint(rct_window* w, rct_drawpixelinfo* dpi)
 
     labelWidget = &window_park_entrance_widgets[WIDX_STATUS];
     gfx_draw_string_centred_clipped(
-        dpi,
-        STR_BLACK_STRING,
-        gCommonFormatArgs,
-        COLOUR_BLACK,
-        w->x + (labelWidget->left + labelWidget->right) / 2,
-        w->y + labelWidget->top,
-        labelWidget->right - labelWidget->left);
+        dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, w->x + (labelWidget->left + labelWidget->right) / 2,
+        w->y + labelWidget->top, labelWidget->right - labelWidget->left);
 }
 
 /**
@@ -929,17 +924,9 @@ static void window_park_init_viewport(rct_window* w)
         {
             rct_widget* viewportWidget = &window_park_entrance_widgets[WIDX_VIEWPORT];
             viewport_create(
-                w,
-                w->x + viewportWidget->left + 1,
-                w->y + viewportWidget->top + 1,
-                (viewportWidget->right - viewportWidget->left) - 1,
-                (viewportWidget->bottom - viewportWidget->top) - 1,
-                0,
-                x,
-                y,
-                z,
-                w->viewport_focus_sprite.type & VIEWPORT_FOCUS_TYPE_MASK,
-                -1);
+                w, w->x + viewportWidget->left + 1, w->y + viewportWidget->top + 1,
+                (viewportWidget->right - viewportWidget->left) - 1, (viewportWidget->bottom - viewportWidget->top) - 1, 0, x, y,
+                z, w->viewport_focus_sprite.type & VIEWPORT_FOCUS_TYPE_MASK, -1);
             w->flags |= (1 << 2);
             window_invalidate(w);
         }
@@ -1061,12 +1048,7 @@ static void window_park_rating_paint(rct_window* w, rct_drawpixelinfo* dpi)
 
     // Graph border
     gfx_fill_rect_inset(
-        dpi,
-        x + widget->left + 4,
-        y + widget->top + 15,
-        x + widget->right - 4,
-        y + widget->bottom - 4,
-        w->colours[1],
+        dpi, x + widget->left + 4, y + widget->top + 15, x + widget->right - 4, y + widget->bottom - 4, w->colours[1],
         INSET_RECT_F_30);
 
     // Graph
@@ -1189,12 +1171,7 @@ static void window_park_guests_paint(rct_window* w, rct_drawpixelinfo* dpi)
 
     // Graph border
     gfx_fill_rect_inset(
-        dpi,
-        x + widget->left + 4,
-        y + widget->top + 15,
-        x + widget->right - 4,
-        y + widget->bottom - 4,
-        w->colours[1],
+        dpi, x + widget->left + 4, y + widget->top + 15, x + widget->right - 4, y + widget->bottom - 4, w->colours[1],
         INSET_RECT_F_30);
 
     // Graph
@@ -1836,11 +1813,8 @@ static void window_park_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
 
         sprite_idx |= 0xA9E00000;
         gfx_draw_sprite(
-            dpi,
-            sprite_idx,
-            w->x + (w->widgets[WIDX_TAB_3].left + w->widgets[WIDX_TAB_3].right) / 2,
-            w->y + w->widgets[WIDX_TAB_3].bottom - 9,
-            0);
+            dpi, sprite_idx, w->x + (w->widgets[WIDX_TAB_3].left + w->widgets[WIDX_TAB_3].right) / 2,
+            w->y + w->widgets[WIDX_TAB_3].bottom - 9, 0);
     }
 
     // Price tab
diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp
index 349002abb7..8f8b32ce47 100644
--- a/src/openrct2-ui/windows/Player.cpp
+++ b/src/openrct2-ui/windows/Player.cpp
@@ -236,14 +236,8 @@ static void window_player_overview_show_group_dropdown(rct_window* w, rct_widget
     numItems = network_get_num_groups();
 
     window_dropdown_show_text_custom_width(
-        w->x + dropdownWidget->left,
-        w->y + dropdownWidget->top,
-        dropdownWidget->bottom - dropdownWidget->top + 1,
-        w->colours[1],
-        0,
-        0,
-        numItems,
-        widget->right - dropdownWidget->left);
+        w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+        w->colours[1], 0, 0, numItems, widget->right - dropdownWidget->left);
 
     for (i = 0; i < network_get_num_groups(); i++)
     {
@@ -371,13 +365,8 @@ void window_player_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
         set_format_arg(0, const char*, buffer);
 
         gfx_draw_string_centred_clipped(
-            dpi,
-            STR_STRING,
-            gCommonFormatArgs,
-            COLOUR_BLACK,
-            w->x + (widget->left + widget->right - 11) / 2,
-            w->y + widget->top,
-            widget->right - widget->left - 8);
+            dpi, STR_STRING, gCommonFormatArgs, COLOUR_BLACK, w->x + (widget->left + widget->right - 11) / 2,
+            w->y + widget->top, widget->right - widget->left - 8);
     }
 
     // Draw ping
diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp
index e9e3b48559..b64e2c5f6c 100644
--- a/src/openrct2-ui/windows/Research.cpp
+++ b/src/openrct2-ui/windows/Research.cpp
@@ -463,14 +463,8 @@ static void window_research_funding_mousedown(rct_window* w, rct_widgetindex wid
         gDropdownItemsArgs[i] = ResearchFundingLevelNames[i];
     }
     window_dropdown_show_text_custom_width(
-        w->x + dropdownWidget->left,
-        w->y + dropdownWidget->top,
-        dropdownWidget->bottom - dropdownWidget->top + 1,
-        w->colours[1],
-        0,
-        DROPDOWN_FLAG_STAY_OPEN,
-        4,
-        dropdownWidget->right - dropdownWidget->left - 3);
+        w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+        w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, 4, dropdownWidget->right - dropdownWidget->left - 3);
 
     int32_t currentResearchLevel = gResearchFundingLevel;
     dropdown_set_checked(currentResearchLevel, true);
diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index 8ca6039e94..7fc7c5aabc 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -1924,17 +1924,8 @@ static void window_ride_init_viewport(rct_window* w)
         int32_t width = view_widget->right - view_widget->left - 1;
         int32_t height = view_widget->bottom - view_widget->top - 1;
         viewport_create(
-            w,
-            x,
-            y,
-            width,
-            height,
-            focus.coordinate.zoom,
-            focus.coordinate.x,
-            focus.coordinate.y & VIEWPORT_FOCUS_Y_MASK,
-            focus.coordinate.z,
-            focus.sprite.type & VIEWPORT_FOCUS_TYPE_MASK,
-            focus.sprite.sprite_id);
+            w, x, y, width, height, focus.coordinate.zoom, focus.coordinate.x, focus.coordinate.y & VIEWPORT_FOCUS_Y_MASK,
+            focus.coordinate.z, focus.sprite.type & VIEWPORT_FOCUS_TYPE_MASK, focus.sprite.sprite_id);
 
         w->flags |= WF_NO_SCROLLING;
         window_invalidate(w);
@@ -1957,12 +1948,7 @@ static void window_ride_rename(rct_window* w)
     ride = get_ride(w->number);
     set_format_arg(16, uint32_t, ride->name_arguments);
     window_text_input_open(
-        w,
-        WIDX_RENAME,
-        STR_RIDE_ATTRACTION_NAME,
-        STR_ENTER_NEW_NAME_FOR_THIS_RIDE_ATTRACTION,
-        ride->name,
-        ride->name_arguments,
+        w, WIDX_RENAME, STR_RIDE_ATTRACTION_NAME, STR_ENTER_NEW_NAME_FOR_THIS_RIDE_ATTRACTION, ride->name, ride->name_arguments,
         32);
 }
 
@@ -2064,14 +2050,8 @@ static void window_ride_show_view_dropdown(rct_window* w, rct_widget* widget)
     }
 
     window_dropdown_show_text_custom_width(
-        w->x + dropdownWidget->left,
-        w->y + dropdownWidget->top,
-        dropdownWidget->bottom - dropdownWidget->top + 1,
-        w->colours[1],
-        0,
-        0,
-        numItems,
-        widget->right - dropdownWidget->left);
+        w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+        w->colours[1], 0, 0, numItems, widget->right - dropdownWidget->left);
 
     // First item
     gDropdownItemsFormat[0] = STR_DROPDOWN_MENU_LABEL;
@@ -2219,12 +2199,8 @@ static void window_ride_show_ride_type_dropdown(rct_window* w, rct_widget* widge
 
     rct_widget* dropdownWidget = widget - 1;
     window_dropdown_show_text(
-        w->x + dropdownWidget->left,
-        w->y + dropdownWidget->top,
-        dropdownWidget->bottom - dropdownWidget->top + 1,
-        w->colours[1],
-        DROPDOWN_FLAG_STAY_OPEN,
-        RIDE_TYPE_COUNT);
+        w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+        w->colours[1], DROPDOWN_FLAG_STAY_OPEN, RIDE_TYPE_COUNT);
 
     // Find the current ride type in the ordered list.
     uint8_t pos = 0;
@@ -2300,8 +2276,7 @@ static void populate_vehicle_type_dropdown(Ride* ride)
                     continue;
             }
 
-            VehicleTypeLabel label = { rideEntryIndex,
-                                       currentRideEntry->naming.name,
+            VehicleTypeLabel label = { rideEntryIndex, currentRideEntry->naming.name,
                                        ls.GetString(currentRideEntry->naming.name) };
             VehicleDropdownData.push_back(label);
         }
@@ -2331,14 +2306,8 @@ static void window_ride_show_vehicle_type_dropdown(rct_window* w, rct_widget* wi
 
     rct_widget* dropdownWidget = widget - 1;
     window_dropdown_show_text_custom_width(
-        w->x + dropdownWidget->left,
-        w->y + dropdownWidget->top,
-        dropdownWidget->bottom - dropdownWidget->top + 1,
-        w->colours[1],
-        0,
-        DROPDOWN_FLAG_STAY_OPEN,
-        numItems,
-        widget->right - dropdownWidget->left);
+        w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+        w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, numItems, widget->right - dropdownWidget->left);
 
     // Find the current vehicle type in the ordered list.
     uint8_t pos = 0;
@@ -2798,23 +2767,14 @@ static void window_ride_main_paint(rct_window* w, rct_drawpixelinfo* dpi)
 
     widget = &window_ride_main_widgets[WIDX_VIEW];
     gfx_draw_string_centred(
-        dpi,
-        STR_WINDOW_COLOUR_2_STRINGID,
-        w->x + (widget->left + widget->right - 11) / 2,
-        w->y + widget->top,
-        COLOUR_BLACK,
+        dpi, STR_WINDOW_COLOUR_2_STRINGID, w->x + (widget->left + widget->right - 11) / 2, w->y + widget->top, COLOUR_BLACK,
         gCommonFormatArgs);
 
     // Status
     widget = &window_ride_main_widgets[WIDX_STATUS];
     gfx_draw_string_centred_clipped(
-        dpi,
-        window_ride_get_status(w, gCommonFormatArgs),
-        gCommonFormatArgs,
-        COLOUR_BLACK,
-        w->x + (widget->left + widget->right) / 2,
-        w->y + widget->top,
-        widget->right - widget->left);
+        dpi, window_ride_get_status(w, gCommonFormatArgs), gCommonFormatArgs, COLOUR_BLACK,
+        w->x + (widget->left + widget->right) / 2, w->y + widget->top, widget->right - widget->left);
 }
 
 #pragma endregion
@@ -3281,14 +3241,8 @@ static void window_ride_mode_dropdown(rct_window* w, rct_widget* widget)
         gDropdownItemsArgs[i] = RideModeNames[availableModes[i]];
     }
     window_dropdown_show_text_custom_width(
-        w->x + dropdownWidget->left,
-        w->y + dropdownWidget->top,
-        dropdownWidget->bottom - dropdownWidget->top + 1,
-        w->colours[1],
-        0,
-        DROPDOWN_FLAG_STAY_OPEN,
-        numAvailableModes,
-        widget->right - dropdownWidget->left);
+        w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+        w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, numAvailableModes, widget->right - dropdownWidget->left);
 
     // Set checked item
     for (i = 0; i < numAvailableModes; i++)
@@ -3318,14 +3272,8 @@ static void window_ride_load_dropdown(rct_window* w, rct_widget* widget)
         gDropdownItemsArgs[i] = VehicleLoadNames[i];
     }
     window_dropdown_show_text_custom_width(
-        w->x + dropdownWidget->left,
-        w->y + dropdownWidget->top,
-        dropdownWidget->bottom - dropdownWidget->top + 1,
-        w->colours[1],
-        0,
-        DROPDOWN_FLAG_STAY_OPEN,
-        5,
-        widget->right - dropdownWidget->left);
+        w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+        w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, 5, widget->right - dropdownWidget->left);
 
     dropdown_set_checked(ride->depart_flags & RIDE_DEPART_WAIT_FOR_LOAD_MASK, true);
 }
@@ -3407,48 +3355,42 @@ static void window_ride_operating_mousedown(rct_window* w, rct_widgetindex widge
             upper_bound = gCheatsFastLiftHill ? 255 : RideLiftData[ride->type].maximum_speed;
             lower_bound = gCheatsFastLiftHill ? 0 : RideLiftData[ride->type].minimum_speed;
             set_operating_setting(
-                w->number,
-                RIDE_SETTING_LIFT_HILL_SPEED,
+                w->number, RIDE_SETTING_LIFT_HILL_SPEED,
                 Math::Clamp<int16_t>(lower_bound, ride->lift_hill_speed + 1, upper_bound));
             break;
         case WIDX_LIFT_HILL_SPEED_DECREASE:
             upper_bound = gCheatsFastLiftHill ? 255 : RideLiftData[ride->type].maximum_speed;
             lower_bound = gCheatsFastLiftHill ? 0 : RideLiftData[ride->type].minimum_speed;
             set_operating_setting(
-                w->number,
-                RIDE_SETTING_LIFT_HILL_SPEED,
+                w->number, RIDE_SETTING_LIFT_HILL_SPEED,
                 Math::Clamp<int16_t>(lower_bound, ride->lift_hill_speed - 1, upper_bound));
             break;
         case WIDX_MINIMUM_LENGTH_INCREASE:
             upper_bound = 250;
             lower_bound = 0;
             set_operating_setting(
-                w->number,
-                RIDE_SETTING_MIN_WAITING_TIME,
+                w->number, RIDE_SETTING_MIN_WAITING_TIME,
                 Math::Clamp<int16_t>(lower_bound, ride->min_waiting_time + 1, upper_bound));
             break;
         case WIDX_MINIMUM_LENGTH_DECREASE:
             upper_bound = 250;
             lower_bound = 0;
             set_operating_setting(
-                w->number,
-                RIDE_SETTING_MIN_WAITING_TIME,
+                w->number, RIDE_SETTING_MIN_WAITING_TIME,
                 Math::Clamp<int16_t>(lower_bound, ride->min_waiting_time - 1, upper_bound));
             break;
         case WIDX_MAXIMUM_LENGTH_INCREASE:
             upper_bound = 250;
             lower_bound = 0;
             set_operating_setting(
-                w->number,
-                RIDE_SETTING_MAX_WAITING_TIME,
+                w->number, RIDE_SETTING_MAX_WAITING_TIME,
                 Math::Clamp<int16_t>(lower_bound, ride->max_waiting_time + 1, upper_bound));
             break;
         case WIDX_MAXIMUM_LENGTH_DECREASE:
             upper_bound = 250;
             lower_bound = 0;
             set_operating_setting(
-                w->number,
-                RIDE_SETTING_MAX_WAITING_TIME,
+                w->number, RIDE_SETTING_MAX_WAITING_TIME,
                 Math::Clamp<int16_t>(lower_bound, ride->max_waiting_time - 1, upper_bound));
             break;
         case WIDX_MODE_DROPDOWN:
@@ -3769,12 +3711,8 @@ static void window_ride_operating_paint(rct_window* w, rct_drawpixelinfo* dpi)
 
     // Horizontal rule between mode settings and depart settings
     gfx_fill_rect_inset(
-        dpi,
-        w->x + window_ride_operating_widgets[WIDX_PAGE_BACKGROUND].left + 4,
-        w->y + 103,
-        w->x + window_ride_operating_widgets[WIDX_PAGE_BACKGROUND].right - 5,
-        w->y + 104,
-        w->colours[1],
+        dpi, w->x + window_ride_operating_widgets[WIDX_PAGE_BACKGROUND].left + 4, w->y + 103,
+        w->x + window_ride_operating_widgets[WIDX_PAGE_BACKGROUND].right - 5, w->y + 104, w->colours[1],
         INSET_RECT_FLAG_BORDER_INSET);
 
     // Number of block sections
@@ -3782,11 +3720,7 @@ static void window_ride_operating_paint(rct_window* w, rct_drawpixelinfo* dpi)
     {
         blockSections = ride->num_block_brakes + ride->num_stations;
         gfx_draw_string_left(
-            dpi,
-            STR_BLOCK_SECTIONS,
-            &blockSections,
-            COLOUR_BLACK,
-            w->x + 21,
+            dpi, STR_BLOCK_SECTIONS, &blockSections, COLOUR_BLACK, w->x + 21,
             ride->mode == RIDE_MODE_POWERED_LAUNCH_BLOCK_SECTIONED ? w->y + 89 : w->y + 61);
     }
 }
@@ -3912,14 +3846,8 @@ static void window_ride_maintenance_mousedown(rct_window* w, rct_widgetindex wid
                 gDropdownItemsArgs[i] = RideInspectionIntervalNames[i];
             }
             window_dropdown_show_text_custom_width(
-                w->x + dropdownWidget->left,
-                w->y + dropdownWidget->top,
-                dropdownWidget->bottom - dropdownWidget->top + 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                7,
-                widget->right - dropdownWidget->left);
+                w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+                w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, 7, widget->right - dropdownWidget->left);
 
             dropdown_set_checked(ride->inspection_interval, true);
             break;
@@ -3957,12 +3885,8 @@ static void window_ride_maintenance_mousedown(rct_window* w, rct_widgetindex wid
             else
             {
                 window_dropdown_show_text(
-                    w->x + dropdownWidget->left,
-                    w->y + dropdownWidget->top,
-                    dropdownWidget->bottom - dropdownWidget->top + 1,
-                    w->colours[1],
-                    DROPDOWN_FLAG_STAY_OPEN,
-                    num_items);
+                    w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+                    w->colours[1], DROPDOWN_FLAG_STAY_OPEN, num_items);
 
                 num_items = 1;
                 int32_t breakdownReason = ride->breakdown_reason_pending;
@@ -4427,14 +4351,8 @@ static void window_ride_colour_mousedown(rct_window* w, rct_widgetindex widgetIn
             }
 
             window_dropdown_show_text_custom_width(
-                w->x + dropdownWidget->left,
-                w->y + dropdownWidget->top,
-                dropdownWidget->bottom - dropdownWidget->top + 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                4,
-                widget->right - dropdownWidget->left);
+                w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+                w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, 4, widget->right - dropdownWidget->left);
 
             dropdown_set_checked(colourSchemeIndex, true);
             break;
@@ -4455,14 +4373,8 @@ static void window_ride_colour_mousedown(rct_window* w, rct_widgetindex widgetIn
             }
 
             window_dropdown_show_text_custom_width(
-                w->x + dropdownWidget->left,
-                w->y + dropdownWidget->top,
-                dropdownWidget->bottom - dropdownWidget->top + 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                4,
-                widget->right - dropdownWidget->left);
+                w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+                w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, 4, widget->right - dropdownWidget->left);
 
             dropdown_set_checked(ride->track_colour_supports[colourSchemeIndex], true);
             break;
@@ -4480,13 +4392,8 @@ static void window_ride_colour_mousedown(rct_window* w, rct_widgetindex widgetIn
             }
 
             window_dropdown_show_text_custom_width(
-                w->x + dropdownWidget->left,
-                w->y + dropdownWidget->top,
-                dropdownWidget->bottom - dropdownWidget->top + 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                Util::CountOf(window_ride_entrance_style_list),
+                w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+                w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, Util::CountOf(window_ride_entrance_style_list),
                 widget->right - dropdownWidget->left);
 
             if (checkedIndex != -1)
@@ -4503,13 +4410,8 @@ static void window_ride_colour_mousedown(rct_window* w, rct_widgetindex widgetIn
             }
 
             window_dropdown_show_text_custom_width(
-                w->x + dropdownWidget->left,
-                w->y + dropdownWidget->top,
-                dropdownWidget->bottom - dropdownWidget->top + 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                rideEntry->max_cars_in_train > 1 ? 3 : 2,
+                w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+                w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, rideEntry->max_cars_in_train > 1 ? 3 : 2,
                 widget->right - dropdownWidget->left);
 
             dropdown_set_checked(ride->colour_scheme_type & 3, true);
@@ -4529,14 +4431,8 @@ static void window_ride_colour_mousedown(rct_window* w, rct_widgetindex widgetIn
             }
 
             window_dropdown_show_text_custom_width(
-                w->x + dropdownWidget->left,
-                w->y + dropdownWidget->top,
-                dropdownWidget->bottom - dropdownWidget->top + 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                numItems,
-                widget->right - dropdownWidget->left);
+                w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+                w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, numItems, widget->right - dropdownWidget->left);
 
             dropdown_set_checked(w->vehicleIndex, true);
             break;
@@ -4588,13 +4484,8 @@ static void window_ride_colour_dropdown(rct_window* w, rct_widgetindex widgetInd
             break;
         case WIDX_ENTRANCE_STYLE_DROPDOWN:
             game_do_command(
-                0,
-                (6 << 8) | 1,
-                0,
-                (window_ride_entrance_style_list[dropdownIndex] << 8) | w->number,
-                GAME_COMMAND_SET_RIDE_APPEARANCE,
-                0,
-                0);
+                0, (6 << 8) | 1, 0, (window_ride_entrance_style_list[dropdownIndex] << 8) | w->number,
+                GAME_COMMAND_SET_RIDE_APPEARANCE, 0, 0);
             break;
         case WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN:
             game_do_command(0, (5 << 8) | 1, 0, (dropdownIndex << 8) | w->number, GAME_COMMAND_SET_RIDE_APPEARANCE, 0, 0);
@@ -4892,11 +4783,7 @@ static void window_ride_colour_paint(rct_window* w, rct_drawpixelinfo* dpi)
     widget = &window_ride_colour_widgets[WIDX_TRACK_PREVIEW];
     if (widget->type != WWT_EMPTY)
         gfx_fill_rect(
-            dpi,
-            w->x + widget->left + 1,
-            w->y + widget->top + 1,
-            w->x + widget->right - 1,
-            w->y + widget->bottom - 1,
+            dpi, w->x + widget->left + 1, w->y + widget->top + 1, w->x + widget->right - 1, w->y + widget->bottom - 1,
             PALETTE_INDEX_12);
 
     track_colour trackColour = ride_get_track_colour(ride, w->ride_colour);
@@ -4950,11 +4837,7 @@ static void window_ride_colour_paint(rct_window* w, rct_drawpixelinfo* dpi)
     if (widget->type != WWT_EMPTY)
     {
         if (clip_drawpixelinfo(
-                &clippedDpi,
-                dpi,
-                w->x + widget->left + 1,
-                w->y + widget->top + 1,
-                widget->right - widget->left,
+                &clippedDpi, dpi, w->x + widget->left + 1, w->y + widget->top + 1, widget->right - widget->left,
                 widget->bottom - widget->top))
         {
             gfx_clear(&clippedDpi, PALETTE_INDEX_12);
@@ -5135,14 +5018,8 @@ static void window_ride_music_mousedown(rct_window* w, rct_widgetindex widgetInd
     }
 
     window_dropdown_show_text_custom_width(
-        w->x + dropdownWidget->left,
-        w->y + dropdownWidget->top,
-        dropdownWidget->bottom - dropdownWidget->top + 1,
-        w->colours[1],
-        0,
-        DROPDOWN_FLAG_STAY_OPEN,
-        numItems,
-        widget->right - dropdownWidget->left);
+        w->x + dropdownWidget->left, w->y + dropdownWidget->top, dropdownWidget->bottom - dropdownWidget->top + 1,
+        w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN, numItems, widget->right - dropdownWidget->left);
 
     for (i = 0; i < numItems; i++)
     {
diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp
index 88d6ef105e..5783650930 100644
--- a/src/openrct2-ui/windows/RideConstruction.cpp
+++ b/src/openrct2-ui/windows/RideConstruction.cpp
@@ -459,23 +459,11 @@ static void window_ride_construction_entrance_click(rct_window* w);
 static void window_ride_construction_exit_click(rct_window* w);
 
 static void window_ride_construction_draw_track_piece(
-    rct_window* w,
-    rct_drawpixelinfo* dpi,
-    int32_t rideIndex,
-    int32_t trackType,
-    int32_t trackDirection,
-    int32_t unknown,
-    int32_t width,
-    int32_t height);
+    rct_window* w, rct_drawpixelinfo* dpi, int32_t rideIndex, int32_t trackType, int32_t trackDirection, int32_t unknown,
+    int32_t width, int32_t height);
 static void sub_6CBCE2(
-    rct_drawpixelinfo* dpi,
-    int32_t rideIndex,
-    int32_t trackType,
-    int32_t trackDirection,
-    int32_t edx,
-    int32_t originX,
-    int32_t originY,
-    int32_t originZ);
+    rct_drawpixelinfo* dpi, int32_t rideIndex, int32_t trackType, int32_t trackDirection, int32_t edx, int32_t originX,
+    int32_t originY, int32_t originZ);
 static void window_ride_construction_update_map_selection();
 static void window_ride_construction_update_possible_ride_configurations();
 static void window_ride_construction_update_widgets(rct_window* w);
@@ -1693,12 +1681,8 @@ static void window_ride_construction_construct(rct_window* w)
 
     gGameCommandErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE;
     _trackPlaceCost = game_do_command(
-        x,
-        (GAME_COMMAND_FLAG_APPLY) | (trackDirection << 8),
-        y,
-        rideIndex | (trackType << 8) | (liftHillAndAlternativeState << 16),
-        GAME_COMMAND_PLACE_TRACK,
-        z | (properties << 16),
+        x, (GAME_COMMAND_FLAG_APPLY) | (trackDirection << 8), y,
+        rideIndex | (trackType << 8) | (liftHillAndAlternativeState << 16), GAME_COMMAND_PLACE_TRACK, z | (properties << 16),
         0);
     if (_trackPlaceCost == MONEY32_UNDEFINED)
     {
@@ -1886,11 +1870,7 @@ static void window_ride_construction_mouseup_demolish(rct_window* w)
     }
 
     money32 cost = ride_remove_track_piece(
-        _currentTrackBeginX,
-        _currentTrackBeginY,
-        _currentTrackBeginZ,
-        _currentTrackPieceDirection,
-        _currentTrackPieceType,
+        _currentTrackBeginX, _currentTrackBeginY, _currentTrackBeginZ, _currentTrackPieceDirection, _currentTrackPieceType,
         GAME_COMMAND_FLAG_APPLY);
     if (cost == MONEY32_UNDEFINED)
     {
@@ -2258,14 +2238,8 @@ static void window_ride_construction_paint(rct_window* w, rct_drawpixelinfo* dpi
 }
 
 static void window_ride_construction_draw_track_piece(
-    rct_window* w,
-    rct_drawpixelinfo* dpi,
-    int32_t rideIndex,
-    int32_t trackType,
-    int32_t trackDirection,
-    int32_t unknown,
-    int32_t width,
-    int32_t height)
+    rct_window* w, rct_drawpixelinfo* dpi, int32_t rideIndex, int32_t trackType, int32_t trackDirection, int32_t unknown,
+    int32_t width, int32_t height)
 {
     const rct_preview_track* trackBlock;
     Ride* ride;
@@ -2340,14 +2314,8 @@ static rct_tile_element* _backupTileElementArrays[5];
  * dh: trackType
  */
 static void sub_6CBCE2(
-    rct_drawpixelinfo* dpi,
-    int32_t rideIndex,
-    int32_t trackType,
-    int32_t trackDirection,
-    int32_t edx,
-    int32_t originX,
-    int32_t originY,
-    int32_t originZ)
+    rct_drawpixelinfo* dpi, int32_t rideIndex, int32_t trackType, int32_t trackDirection, int32_t edx, int32_t originX,
+    int32_t originY, int32_t originZ)
 {
     Ride* ride;
     const rct_preview_track* trackBlock;
@@ -3391,14 +3359,8 @@ static void window_ride_construction_show_special_track_dropdown(rct_window* w,
     }
 
     window_dropdown_show_text_custom_width(
-        w->x + widget->left,
-        w->y + widget->top,
-        widget->bottom - widget->top + 1,
-        w->colours[1],
-        0,
-        0,
-        _numCurrentPossibleRideConfigurations,
-        widget->right - widget->left);
+        w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0, 0,
+        _numCurrentPossibleRideConfigurations, widget->right - widget->left);
 
     for (int32_t i = 0; i < 32; i++)
     {
@@ -3457,13 +3419,8 @@ static void ride_construction_set_brakes_speed(int32_t brakesSpeed)
     if (!sub_6C683D(&x, &y, &z, _currentTrackPieceDirection & 3, _currentTrackPieceType, 0, &tileElement, 0))
     {
         game_do_command(
-            _currentTrackBeginX,
-            GAME_COMMAND_FLAG_APPLY | ((brakesSpeed) << 8),
-            _currentTrackBeginY,
-            track_element_get_type(tileElement),
-            GAME_COMMAND_SET_BRAKES_SPEED,
-            _currentTrackBeginZ,
-            0);
+            _currentTrackBeginX, GAME_COMMAND_FLAG_APPLY | ((brakesSpeed) << 8), _currentTrackBeginY,
+            track_element_get_type(tileElement), GAME_COMMAND_SET_BRAKES_SPEED, _currentTrackBeginZ, 0);
     }
     window_ride_construction_update_active_elements();
 }
@@ -3818,14 +3775,8 @@ void ride_construction_tooldown_construct(int32_t screenX, int32_t screenY)
             gDisableErrorWindowSound = true;
 
             _trackPlaceCost = maze_set_track(
-                _currentTrackBeginX,
-                _currentTrackBeginY,
-                _currentTrackBeginZ,
-                GAME_COMMAND_FLAG_APPLY,
-                true,
-                0,
-                _currentRideIndex,
-                GC_SET_MAZE_TRACK_BUILD);
+                _currentTrackBeginX, _currentTrackBeginY, _currentTrackBeginZ, GAME_COMMAND_FLAG_APPLY, true, 0,
+                _currentRideIndex, GC_SET_MAZE_TRACK_BUILD);
 
             gDisableErrorWindowSound = false;
 
@@ -3968,13 +3919,9 @@ static void ride_construction_tooldown_entrance_exit(int32_t screenX, int32_t sc
 
     game_command_callback = game_command_callback_place_ride_entrance_or_exit;
     game_do_command(
-        _unkF44188.x,
-        (GAME_COMMAND_FLAG_APPLY) | ((gRideEntranceExitPlaceDirection ^ 2) << 8),
-        _unkF44188.y,
-        gRideEntranceExitPlaceRideIndex | (gRideEntranceExitPlaceType << 8),
-        GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT,
-        gRideEntranceExitPlaceStationIndex,
-        0);
+        _unkF44188.x, (GAME_COMMAND_FLAG_APPLY) | ((gRideEntranceExitPlaceDirection ^ 2) << 8), _unkF44188.y,
+        gRideEntranceExitPlaceRideIndex | (gRideEntranceExitPlaceType << 8), GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT,
+        gRideEntranceExitPlaceStationIndex, 0);
 }
 
 void window_ride_construction_keyboard_shortcut_turn_left()
diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp
index 4ec3f8e169..a35b9fc0ea 100644
--- a/src/openrct2-ui/windows/RideList.cpp
+++ b/src/openrct2-ui/windows/RideList.cpp
@@ -354,14 +354,8 @@ static void window_ride_list_mousedown(rct_window* w, rct_widgetindex widgetInde
         }
 
         window_dropdown_show_text_custom_width(
-            w->x + widget->left,
-            w->y + widget->top,
-            widget->bottom - widget->top,
-            w->colours[1],
-            0,
-            DROPDOWN_FLAG_STAY_OPEN,
-            numItems,
-            widget->right - widget->left - 3);
+            w->x + widget->left, w->y + widget->top, widget->bottom - widget->top, w->colours[1], 0, DROPDOWN_FLAG_STAY_OPEN,
+            numItems, widget->right - widget->left - 3);
         if (selectedIndex != -1)
         {
             dropdown_set_checked(selectedIndex, true);
@@ -591,11 +585,7 @@ static void window_ride_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
 
     // Draw number of attractions on bottom
     gfx_draw_string_left(
-        dpi,
-        ride_list_statusbar_count_strings[w->page],
-        &w->no_list_items,
-        COLOUR_BLACK,
-        w->x + 4,
+        dpi, ride_list_statusbar_count_strings[w->page], &w->no_list_items, COLOUR_BLACK, w->x + 4,
         w->widgets[WIDX_LIST].bottom + w->y + 2);
 }
 
diff --git a/src/openrct2-ui/windows/Scenery.cpp b/src/openrct2-ui/windows/Scenery.cpp
index a73dba0e83..6161d678d1 100644
--- a/src/openrct2-ui/windows/Scenery.cpp
+++ b/src/openrct2-ui/windows/Scenery.cpp
@@ -444,13 +444,8 @@ rct_window* window_scenery_open()
     window_scenery_init();
 
     window = window_create(
-        context_get_width() - WINDOW_SCENERY_WIDTH,
-        0x1D,
-        WINDOW_SCENERY_WIDTH,
-        WINDOW_SCENERY_HEIGHT,
-        &window_scenery_events,
-        WC_SCENERY,
-        WF_NO_SCROLLING);
+        context_get_width() - WINDOW_SCENERY_WIDTH, 0x1D, WINDOW_SCENERY_WIDTH, WINDOW_SCENERY_HEIGHT, &window_scenery_events,
+        WC_SCENERY, WF_NO_SCROLLING);
     window->widgets = window_scenery_widgets;
 
     window->enabled_widgets = (1 << WIDX_SCENERY_CLOSE) | (1 << WIDX_SCENERY_ROTATE_OBJECTS_BUTTON) | (1 << WIDX_SCENERY_TAB_1)
@@ -1119,10 +1114,7 @@ void window_scenery_paint(rct_window* w, rct_drawpixelinfo* dpi)
     uint32_t imageId = ((w->colours[1] << 19) | window_scenery_widgets[selectedWidgetId].image) + 1ul;
 
     gfx_draw_sprite(
-        dpi,
-        imageId,
-        w->x + window_scenery_widgets[selectedWidgetId].left,
-        w->y + window_scenery_widgets[selectedWidgetId].top,
+        dpi, imageId, w->x + window_scenery_widgets[selectedWidgetId].left, w->y + window_scenery_widgets[selectedWidgetId].top,
         selectedWidgetId);
 
     int16_t selectedSceneryEntryId = w->scenery.selected_scenery_id;
@@ -1210,12 +1202,7 @@ void window_scenery_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t s
             if (w->scenery.selected_scenery_id == currentSceneryGlobalId)
             {
                 gfx_fill_rect_inset(
-                    dpi,
-                    left,
-                    top,
-                    left + SCENERY_BUTTON_WIDTH - 1,
-                    top + SCENERY_BUTTON_HEIGHT - 1,
-                    w->colours[1],
+                    dpi, left, top, left + SCENERY_BUTTON_WIDTH - 1, top + SCENERY_BUTTON_HEIGHT - 1, w->colours[1],
                     INSET_RECT_FLAG_FILL_MID_LIGHT);
             }
         }
@@ -1224,23 +1211,13 @@ void window_scenery_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t s
             if (tabSelectedSceneryId == currentSceneryGlobalId)
             {
                 gfx_fill_rect_inset(
-                    dpi,
-                    left,
-                    top,
-                    left + SCENERY_BUTTON_WIDTH - 1,
-                    top + SCENERY_BUTTON_HEIGHT - 1,
-                    w->colours[1],
+                    dpi, left, top, left + SCENERY_BUTTON_WIDTH - 1, top + SCENERY_BUTTON_HEIGHT - 1, w->colours[1],
                     (INSET_RECT_FLAG_BORDER_INSET | INSET_RECT_FLAG_FILL_MID_LIGHT));
             }
             else if (w->scenery.selected_scenery_id == currentSceneryGlobalId)
             {
                 gfx_fill_rect_inset(
-                    dpi,
-                    left,
-                    top,
-                    left + SCENERY_BUTTON_WIDTH - 1,
-                    top + SCENERY_BUTTON_HEIGHT - 1,
-                    w->colours[1],
+                    dpi, left, top, left + SCENERY_BUTTON_WIDTH - 1, top + SCENERY_BUTTON_HEIGHT - 1, w->colours[1],
                     INSET_RECT_FLAG_FILL_MID_LIGHT);
             }
         }
diff --git a/src/openrct2-ui/windows/ServerList.cpp b/src/openrct2-ui/windows/ServerList.cpp
index f016f5263a..f24357b71f 100644
--- a/src/openrct2-ui/windows/ServerList.cpp
+++ b/src/openrct2-ui/windows/ServerList.cpp
@@ -541,9 +541,8 @@ static void server_list_save_server_entries()
     // Save just favourite servers
     std::vector<server_entry> favouriteServers;
     std::copy_if(
-        _serverEntries.begin(), _serverEntries.end(), std::back_inserter(favouriteServers), [](const server_entry& entry) {
-            return entry.favourite;
-        });
+        _serverEntries.begin(), _serverEntries.end(), std::back_inserter(favouriteServers),
+        [](const server_entry& entry) { return entry.favourite; });
     server_list_write(favouriteServers);
 }
 
diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp
index ee2e1111ad..e39a5a8175 100644
--- a/src/openrct2-ui/windows/Sign.cpp
+++ b/src/openrct2-ui/windows/Sign.cpp
@@ -185,17 +185,8 @@ rct_window* window_sign_open(rct_windownumber number)
     // Create viewport
     viewportWidget = &window_sign_widgets[WIDX_VIEWPORT];
     viewport_create(
-        w,
-        w->x + viewportWidget->left + 1,
-        w->y + viewportWidget->top + 1,
-        (viewportWidget->right - viewportWidget->left) - 1,
-        (viewportWidget->bottom - viewportWidget->top) - 1,
-        0,
-        view_x,
-        view_y,
-        view_z,
-        0,
-        -1);
+        w, w->x + viewportWidget->left + 1, w->y + viewportWidget->top + 1, (viewportWidget->right - viewportWidget->left) - 1,
+        (viewportWidget->bottom - viewportWidget->top) - 1, 0, view_x, view_y, view_z, 0, -1);
 
     w->viewport->flags = gConfigGeneral.always_show_gridlines ? VIEWPORT_FLAG_GRIDLINES : 0;
     window_invalidate(w);
@@ -238,13 +229,9 @@ static void window_sign_mouseup(rct_window* w, rct_widgetindex widgetIndex)
                 tile_element++;
             }
             game_do_command(
-                x,
-                1 | (tile_element->GetDirection() << 8),
-                y,
-                tile_element->base_height | (scenery_large_get_sequence(tile_element) << 8),
-                GAME_COMMAND_REMOVE_LARGE_SCENERY,
-                0,
-                0);
+                x, 1 | (tile_element->GetDirection() << 8), y,
+                tile_element->base_height | (scenery_large_get_sequence(tile_element) << 8), GAME_COMMAND_REMOVE_LARGE_SCENERY,
+                0, 0);
             break;
         case WIDX_SIGN_TEXT:
             if (banner->flags & BANNER_FLAG_LINKED_TO_RIDE)
@@ -382,17 +369,8 @@ static void window_sign_viewport_rotate(rct_window* w)
     // Create viewport
     rct_widget* viewportWidget = &window_sign_widgets[WIDX_VIEWPORT];
     viewport_create(
-        w,
-        w->x + viewportWidget->left + 1,
-        w->y + viewportWidget->top + 1,
-        (viewportWidget->right - viewportWidget->left) - 1,
-        (viewportWidget->bottom - viewportWidget->top) - 1,
-        0,
-        view_x,
-        view_y,
-        view_z,
-        0,
-        -1);
+        w, w->x + viewportWidget->left + 1, w->y + viewportWidget->top + 1, (viewportWidget->right - viewportWidget->left) - 1,
+        (viewportWidget->bottom - viewportWidget->top) - 1, 0, view_x, view_y, view_z, 0, -1);
 
     w->viewport->flags = gConfigGeneral.always_show_gridlines ? VIEWPORT_FLAG_GRIDLINES : 0;
     window_invalidate(w);
@@ -455,17 +433,8 @@ rct_window* window_sign_small_open(rct_windownumber number)
     // Create viewport
     viewportWidget = &window_sign_widgets[WIDX_VIEWPORT];
     viewport_create(
-        w,
-        w->x + viewportWidget->left + 1,
-        w->y + viewportWidget->top + 1,
-        (viewportWidget->right - viewportWidget->left) - 1,
-        (viewportWidget->bottom - viewportWidget->top) - 1,
-        0,
-        view_x,
-        view_y,
-        view_z,
-        0,
-        -1);
+        w, w->x + viewportWidget->left + 1, w->y + viewportWidget->top + 1, (viewportWidget->right - viewportWidget->left) - 1,
+        (viewportWidget->bottom - viewportWidget->top) - 1, 0, view_x, view_y, view_z, 0, -1);
 
     w->viewport->flags = gConfigGeneral.always_show_gridlines ? VIEWPORT_FLAG_GRIDLINES : 0;
     w->flags |= WF_NO_SCROLLING;
diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp
index f1ce916802..931c227378 100644
--- a/src/openrct2-ui/windows/Staff.cpp
+++ b/src/openrct2-ui/windows/Staff.cpp
@@ -465,12 +465,7 @@ void window_staff_overview_mouseup(rct_window* w, rct_widgetindex widgetIndex)
         }
         case WIDX_RENAME:
             window_text_input_open(
-                w,
-                widgetIndex,
-                STR_STAFF_TITLE_STAFF_MEMBER_NAME,
-                STR_STAFF_PROMPT_ENTER_NAME,
-                peep->name_string_idx,
-                peep->id,
+                w, widgetIndex, STR_STAFF_TITLE_STAFF_MEMBER_NAME, STR_STAFF_PROMPT_ENTER_NAME, peep->name_string_idx, peep->id,
                 32);
             break;
     }
diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp
index 171cf35ab7..0eb48e1a41 100644
--- a/src/openrct2-ui/windows/StaffList.cpp
+++ b/src/openrct2-ui/windows/StaffList.cpp
@@ -571,48 +571,40 @@ void window_staff_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
     i += g_peep_animation_entries[PEEP_SPRITE_TYPE_HANDYMAN].sprite_animation->base_image + 1;
     i |= SPRITE_ID_PALETTE_COLOUR_1(gStaffHandymanColour);
     gfx_draw_sprite(
-        dpi,
-        i,
+        dpi, i,
         (window_staff_list_widgets[WIDX_STAFF_LIST_HANDYMEN_TAB].left
          + window_staff_list_widgets[WIDX_STAFF_LIST_HANDYMEN_TAB].right)
                 / 2
             + w->x,
-        window_staff_list_widgets[WIDX_STAFF_LIST_HANDYMEN_TAB].bottom - 6 + w->y,
-        0);
+        window_staff_list_widgets[WIDX_STAFF_LIST_HANDYMEN_TAB].bottom - 6 + w->y, 0);
 
     // Mechanic tab image
     i = (selectedTab == 1 ? (w->list_information_type & ~3) : 0);
     i += g_peep_animation_entries[PEEP_SPRITE_TYPE_MECHANIC].sprite_animation->base_image + 1;
     i |= SPRITE_ID_PALETTE_COLOUR_1(gStaffMechanicColour);
     gfx_draw_sprite(
-        dpi,
-        i,
+        dpi, i,
         (window_staff_list_widgets[WIDX_STAFF_LIST_MECHANICS_TAB].left
          + window_staff_list_widgets[WIDX_STAFF_LIST_MECHANICS_TAB].right)
                 / 2
             + w->x,
-        window_staff_list_widgets[WIDX_STAFF_LIST_MECHANICS_TAB].bottom - 6 + w->y,
-        0);
+        window_staff_list_widgets[WIDX_STAFF_LIST_MECHANICS_TAB].bottom - 6 + w->y, 0);
 
     // Security tab image
     i = (selectedTab == 2 ? (w->list_information_type & ~3) : 0);
     i += g_peep_animation_entries[PEEP_SPRITE_TYPE_SECURITY].sprite_animation->base_image + 1;
     i |= SPRITE_ID_PALETTE_COLOUR_1(gStaffSecurityColour);
     gfx_draw_sprite(
-        dpi,
-        i,
+        dpi, i,
         (window_staff_list_widgets[WIDX_STAFF_LIST_SECURITY_TAB].left
          + window_staff_list_widgets[WIDX_STAFF_LIST_SECURITY_TAB].right)
                 / 2
             + w->x,
-        window_staff_list_widgets[WIDX_STAFF_LIST_SECURITY_TAB].bottom - 6 + w->y,
-        0);
+        window_staff_list_widgets[WIDX_STAFF_LIST_SECURITY_TAB].bottom - 6 + w->y, 0);
 
     rct_drawpixelinfo sprite_dpi;
     if (clip_drawpixelinfo(
-            &sprite_dpi,
-            dpi,
-            window_staff_list_widgets[WIDX_STAFF_LIST_ENTERTAINERS_TAB].left + w->x + 1,
+            &sprite_dpi, dpi, window_staff_list_widgets[WIDX_STAFF_LIST_ENTERTAINERS_TAB].left + w->x + 1,
             window_staff_list_widgets[WIDX_STAFF_LIST_ENTERTAINERS_TAB].top + w->y + 1,
             window_staff_list_widgets[WIDX_STAFF_LIST_ENTERTAINERS_TAB].right
                 - window_staff_list_widgets[WIDX_STAFF_LIST_ENTERTAINERS_TAB].left - 1,
@@ -634,11 +626,7 @@ void window_staff_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
     if (selectedTab < 3)
     {
         gfx_draw_string_left(
-            dpi,
-            STR_UNIFORM_COLOUR,
-            w,
-            COLOUR_BLACK,
-            w->x + 6,
+            dpi, STR_UNIFORM_COLOUR, w, COLOUR_BLACK, w->x + 6,
             window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].top + w->y + 1);
     }
 
@@ -653,11 +641,7 @@ void window_staff_list_paint(rct_window* w, rct_drawpixelinfo* dpi)
     set_format_arg(2, rct_string_id, staffTypeStringId);
 
     gfx_draw_string_left(
-        dpi,
-        STR_STAFF_LIST_COUNTER,
-        gCommonFormatArgs,
-        COLOUR_BLACK,
-        w->x + 4,
+        dpi, STR_STAFF_LIST_COUNTER, gCommonFormatArgs, COLOUR_BLACK, w->x + 4,
         window_staff_list_widgets[WIDX_STAFF_LIST_LIST].bottom + w->y + 2);
 }
 
diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp
index a769cfd2da..cad088fa69 100644
--- a/src/openrct2-ui/windows/TextInput.cpp
+++ b/src/openrct2-ui/windows/TextInput.cpp
@@ -95,13 +95,8 @@ static int32_t calling_widget = 0;
 static int32_t _maxInputLength;
 
 void window_text_input_open(
-    rct_window* call_w,
-    rct_widgetindex call_widget,
-    rct_string_id title,
-    rct_string_id description,
-    rct_string_id existing_text,
-    uintptr_t existing_args,
-    int32_t maxLength)
+    rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description,
+    rct_string_id existing_text, uintptr_t existing_args, int32_t maxLength)
 {
     // Get the raw string
     utf8 buffer[Util::CountOf(text_input)]{};
@@ -113,12 +108,8 @@ void window_text_input_open(
 }
 
 void window_text_input_raw_open(
-    rct_window* call_w,
-    rct_widgetindex call_widget,
-    rct_string_id title,
-    rct_string_id description,
-    const_utf8string existing_text,
-    int32_t maxLength)
+    rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description,
+    const_utf8string existing_text, int32_t maxLength)
 {
     _maxInputLength = maxLength;
 
diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp
index a82d69dd8c..b589d87154 100644
--- a/src/openrct2-ui/windows/Themes.cpp
+++ b/src/openrct2-ui/windows/Themes.cpp
@@ -316,11 +316,8 @@ static void window_themes_draw_tab_images(rct_drawpixelinfo* dpi, rct_window* w)
         if (_selected_tab == i)
             sprite_idx += w->frame_no / window_themes_tab_animation_divisor[_selected_tab];
         gfx_draw_sprite(
-            dpi,
-            sprite_idx,
-            w->x + w->widgets[WIDX_THEMES_SETTINGS_TAB + i].left,
-            w->y + w->widgets[WIDX_THEMES_SETTINGS_TAB + i].top,
-            0);
+            dpi, sprite_idx, w->x + w->widgets[WIDX_THEMES_SETTINGS_TAB + i].left,
+            w->y + w->widgets[WIDX_THEMES_SETTINGS_TAB + i].top, 0);
     }
 }
 
@@ -371,13 +368,8 @@ static void window_themes_mouseup(rct_window* w, rct_widgetindex widgetIndex)
             activeAvailableThemeIndex = theme_manager_get_active_available_theme_index();
             activeThemeName = theme_manager_get_available_theme_name(activeAvailableThemeIndex);
             window_text_input_open(
-                w,
-                widgetIndex,
-                STR_TITLE_EDITOR_ACTION_DUPLICATE,
-                STR_THEMES_PROMPT_ENTER_THEME_NAME,
-                STR_STRING,
-                (uintptr_t)activeThemeName,
-                64);
+                w, widgetIndex, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_THEMES_PROMPT_ENTER_THEME_NAME, STR_STRING,
+                (uintptr_t)activeThemeName, 64);
             break;
         case WIDX_THEMES_DELETE_BUTTON:
             if (theme_get_flags() & UITHEME_FLAG_PREDEFINED)
@@ -399,13 +391,8 @@ static void window_themes_mouseup(rct_window* w, rct_widgetindex widgetIndex)
                 activeAvailableThemeIndex = theme_manager_get_active_available_theme_index();
                 activeThemeName = theme_manager_get_available_theme_name(activeAvailableThemeIndex);
                 window_text_input_open(
-                    w,
-                    widgetIndex,
-                    STR_TRACK_MANAGE_RENAME,
-                    STR_THEMES_PROMPT_ENTER_THEME_NAME,
-                    STR_STRING,
-                    (uintptr_t)activeThemeName,
-                    64);
+                    w, widgetIndex, STR_TRACK_MANAGE_RENAME, STR_THEMES_PROMPT_ENTER_THEME_NAME, STR_STRING,
+                    (uintptr_t)activeThemeName, 64);
             }
             break;
     }
@@ -536,14 +523,8 @@ static void window_themes_mousedown(rct_window* w, rct_widgetindex widgetIndex,
             }
 
             window_dropdown_show_text_custom_width(
-                w->x + widget->left,
-                w->y + widget->top,
-                widget->bottom - widget->top + 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                num_items,
-                widget->right - widget->left - 3);
+                w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0,
+                DROPDOWN_FLAG_STAY_OPEN, num_items, widget->right - widget->left - 3);
 
             dropdown_set_checked((int32_t)theme_manager_get_active_available_theme_index(), true);
             break;
@@ -861,18 +842,10 @@ void window_themes_paint(rct_window* w, rct_drawpixelinfo* dpi)
         const utf8* activeThemeName = theme_manager_get_available_theme_name(activeAvailableThemeIndex);
         set_format_arg(0, uintptr_t, (uintptr_t)activeThemeName);
         gfx_draw_string_left(
-            dpi,
-            STR_THEMES_LABEL_CURRENT_THEME,
-            nullptr,
-            w->colours[1],
-            w->x + 10,
+            dpi, STR_THEMES_LABEL_CURRENT_THEME, nullptr, w->colours[1], w->x + 10,
             w->y + window_themes_widgets[WIDX_THEMES_PRESETS].top + 1);
         gfx_draw_string_left_clipped(
-            dpi,
-            STR_STRING,
-            gCommonFormatArgs,
-            w->colours[1],
-            w->x + window_themes_widgets[WIDX_THEMES_PRESETS].left + 1,
+            dpi, STR_STRING, gCommonFormatArgs, w->colours[1], w->x + window_themes_widgets[WIDX_THEMES_PRESETS].left + 1,
             w->y + window_themes_widgets[WIDX_THEMES_PRESETS].top,
             w->x + window_themes_widgets[WIDX_THEMES_PRESETS_DROPDOWN].left - window_themes_widgets[WIDX_THEMES_PRESETS].left
                 - 4);
@@ -911,37 +884,21 @@ void window_themes_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t sc
                     translucent_window_palette windowPalette = TranslucentWindowPalettes[BASE_COLOUR(colour)];
 
                     gfx_filter_rect(
-                        dpi,
-                        0,
-                        y + _row_height - 2,
-                        window_themes_widgets[WIDX_THEMES_LIST].right,
-                        y + _row_height - 2,
+                        dpi, 0, y + _row_height - 2, window_themes_widgets[WIDX_THEMES_LIST].right, y + _row_height - 2,
                         windowPalette.highlight);
                     gfx_filter_rect(
-                        dpi,
-                        0,
-                        y + _row_height - 1,
-                        window_themes_widgets[WIDX_THEMES_LIST].right,
-                        y + _row_height - 1,
+                        dpi, 0, y + _row_height - 1, window_themes_widgets[WIDX_THEMES_LIST].right, y + _row_height - 1,
                         windowPalette.shadow);
                 }
                 else
                 {
                     colour = ColourMapA[w->colours[1]].mid_dark;
                     gfx_fill_rect(
-                        dpi,
-                        0,
-                        y + _row_height - 2,
-                        window_themes_widgets[WIDX_THEMES_LIST].right,
-                        y + _row_height - 2,
+                        dpi, 0, y + _row_height - 2, window_themes_widgets[WIDX_THEMES_LIST].right, y + _row_height - 2,
                         colour);
                     colour = ColourMapA[w->colours[1]].lightest;
                     gfx_fill_rect(
-                        dpi,
-                        0,
-                        y + _row_height - 1,
-                        window_themes_widgets[WIDX_THEMES_LIST].right,
-                        y + _row_height - 1,
+                        dpi, 0, y + _row_height - 1, window_themes_widgets[WIDX_THEMES_LIST].right, y + _row_height - 1,
                         colour);
                 }
             }
@@ -963,13 +920,8 @@ void window_themes_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, int32_t sc
                 gfx_draw_sprite(dpi, image, _button_offset_x + 12 * j, y + _button_offset_y, 0);
 
                 gfx_fill_rect_inset(
-                    dpi,
-                    _button_offset_x + 12 * j,
-                    y + _check_offset_y,
-                    _button_offset_x + 12 * j + 9,
-                    y + _check_offset_y + 10,
-                    w->colours[1],
-                    INSET_RECT_F_E0);
+                    dpi, _button_offset_x + 12 * j, y + _check_offset_y, _button_offset_x + 12 * j + 9,
+                    y + _check_offset_y + 10, w->colours[1], INSET_RECT_F_E0);
                 if (colour & COLOUR_FLAG_TRANSLUCENT)
                 {
                     gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM_DARK;
diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp
index 81040e82c4..b2670f233a 100644
--- a/src/openrct2-ui/windows/TileInspector.cpp
+++ b/src/openrct2-ui/windows/TileInspector.cpp
@@ -617,39 +617,24 @@ static void window_tile_inspector_insert_corrupt_element(int32_t elementIndex)
 {
     openrct2_assert(elementIndex >= 0 && elementIndex < windowTileInspectorElementCount, "elementIndex out of range");
     game_do_command(
-        TILE_INSPECTOR_ANY_INSERT_CORRUPT,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        elementIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        0,
-        0);
+        TILE_INSPECTOR_ANY_INSERT_CORRUPT, GAME_COMMAND_FLAG_APPLY, windowTileInspectorTileX | (windowTileInspectorTileY << 8),
+        elementIndex, GAME_COMMAND_MODIFY_TILE, 0, 0);
 }
 
 static void window_tile_inspector_remove_element(int32_t elementIndex)
 {
     openrct2_assert(elementIndex >= 0 && elementIndex < windowTileInspectorElementCount, "elementIndex out of range");
     game_do_command(
-        TILE_INSPECTOR_ANY_REMOVE,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        elementIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        0,
-        0);
+        TILE_INSPECTOR_ANY_REMOVE, GAME_COMMAND_FLAG_APPLY, windowTileInspectorTileX | (windowTileInspectorTileY << 8),
+        elementIndex, GAME_COMMAND_MODIFY_TILE, 0, 0);
 }
 
 static void window_tile_inspector_rotate_element(int32_t elementIndex)
 {
     openrct2_assert(elementIndex >= 0 && elementIndex < windowTileInspectorElementCount, "elementIndex out of range");
     game_do_command(
-        TILE_INSPECTOR_ANY_ROTATE,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        elementIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        0,
-        0);
+        TILE_INSPECTOR_ANY_ROTATE, GAME_COMMAND_FLAG_APPLY, windowTileInspectorTileX | (windowTileInspectorTileY << 8),
+        elementIndex, GAME_COMMAND_MODIFY_TILE, 0, 0);
 }
 
 // Swap element with its parent
@@ -658,26 +643,16 @@ static void window_tile_inspector_swap_elements(int16_t first, int16_t second)
     openrct2_assert(first >= 0 && first < windowTileInspectorElementCount, "first out of range");
     openrct2_assert(second >= 0 && second < windowTileInspectorElementCount, "second out of range");
     game_do_command(
-        TILE_INSPECTOR_ANY_SWAP,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        first,
-        GAME_COMMAND_MODIFY_TILE,
-        second,
-        0);
+        TILE_INSPECTOR_ANY_SWAP, GAME_COMMAND_FLAG_APPLY, windowTileInspectorTileX | (windowTileInspectorTileY << 8), first,
+        GAME_COMMAND_MODIFY_TILE, second, 0);
 }
 
 static void window_tile_inspector_sort_elements()
 {
     openrct2_assert(windowTileInspectorTileSelected, "No tile selected");
     game_do_command(
-        TILE_INSPECTOR_ANY_SORT,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        0,
-        GAME_COMMAND_MODIFY_TILE,
-        0,
-        0);
+        TILE_INSPECTOR_ANY_SORT, GAME_COMMAND_FLAG_APPLY, windowTileInspectorTileX | (windowTileInspectorTileY << 8), 0,
+        GAME_COMMAND_MODIFY_TILE, 0, 0);
 }
 
 static void window_tile_inspector_copy_element(rct_window* w)
@@ -696,73 +671,43 @@ static void window_tile_inspector_paste_element(rct_window* w)
     assert_struct_size(data, sizeof(tileInspectorCopiedElement));
 
     game_do_command(
-        TILE_INSPECTOR_ANY_PASTE,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        data[0],
-        GAME_COMMAND_MODIFY_TILE,
-        data[1],
-        0);
+        TILE_INSPECTOR_ANY_PASTE, GAME_COMMAND_FLAG_APPLY, windowTileInspectorTileX | (windowTileInspectorTileY << 8), data[0],
+        GAME_COMMAND_MODIFY_TILE, data[1], 0);
 }
 
 static void window_tile_inspector_base_height_offset(int16_t elementIndex, int8_t heightOffset)
 {
     game_do_command(
-        TILE_INSPECTOR_ANY_BASE_HEIGHT_OFFSET,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        elementIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        heightOffset,
-        0);
+        TILE_INSPECTOR_ANY_BASE_HEIGHT_OFFSET, GAME_COMMAND_FLAG_APPLY,
+        windowTileInspectorTileX | (windowTileInspectorTileY << 8), elementIndex, GAME_COMMAND_MODIFY_TILE, heightOffset, 0);
 }
 
 static void window_tile_inspector_surface_show_park_fences(bool showFences)
 {
     game_do_command(
-        TILE_INSPECTOR_SURFACE_SHOW_PARK_FENCES,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        showFences,
-        GAME_COMMAND_MODIFY_TILE,
-        0,
-        0);
+        TILE_INSPECTOR_SURFACE_SHOW_PARK_FENCES, GAME_COMMAND_FLAG_APPLY,
+        windowTileInspectorTileX | (windowTileInspectorTileY << 8), showFences, GAME_COMMAND_MODIFY_TILE, 0, 0);
 }
 
 static void window_tile_inspector_surface_toggle_corner(int32_t cornerIndex)
 {
     game_do_command(
-        TILE_INSPECTOR_SURFACE_TOGGLE_CORNER,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        cornerIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        0,
-        0);
+        TILE_INSPECTOR_SURFACE_TOGGLE_CORNER, GAME_COMMAND_FLAG_APPLY,
+        windowTileInspectorTileX | (windowTileInspectorTileY << 8), cornerIndex, GAME_COMMAND_MODIFY_TILE, 0, 0);
 }
 
 static void window_tile_inspector_surface_toggle_diagonal()
 {
     game_do_command(
-        TILE_INSPECTOR_SURFACE_TOGGLE_DIAGONAL,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        0,
-        GAME_COMMAND_MODIFY_TILE,
-        0,
-        0);
+        TILE_INSPECTOR_SURFACE_TOGGLE_DIAGONAL, GAME_COMMAND_FLAG_APPLY,
+        windowTileInspectorTileX | (windowTileInspectorTileY << 8), 0, GAME_COMMAND_MODIFY_TILE, 0, 0);
 }
 
 static void window_tile_inspector_path_set_sloped(int32_t elementIndex, bool sloped)
 {
     game_do_command(
-        TILE_INSPECTOR_PATH_SET_SLOPE,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        elementIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        sloped,
-        0);
+        TILE_INSPECTOR_PATH_SET_SLOPE, GAME_COMMAND_FLAG_APPLY, windowTileInspectorTileX | (windowTileInspectorTileY << 8),
+        elementIndex, GAME_COMMAND_MODIFY_TILE, sloped, 0);
 }
 
 static void window_tile_inspector_path_toggle_edge(int32_t elementIndex, int32_t cornerIndex)
@@ -770,26 +715,16 @@ static void window_tile_inspector_path_toggle_edge(int32_t elementIndex, int32_t
     openrct2_assert(elementIndex >= 0 && elementIndex < windowTileInspectorElementCount, "elementIndex out of range");
     openrct2_assert(cornerIndex >= 0 && cornerIndex < 8, "cornerIndex out of range");
     game_do_command(
-        TILE_INSPECTOR_PATH_TOGGLE_EDGE,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        elementIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        cornerIndex,
-        0);
+        TILE_INSPECTOR_PATH_TOGGLE_EDGE, GAME_COMMAND_FLAG_APPLY, windowTileInspectorTileX | (windowTileInspectorTileY << 8),
+        elementIndex, GAME_COMMAND_MODIFY_TILE, cornerIndex, 0);
 }
 
 static void window_tile_inspector_entrance_make_usable(int32_t elementIndex)
 {
     Guard::ArgumentInRange(elementIndex, 0, windowTileInspectorElementCount - 1);
     game_do_command(
-        TILE_INSPECTOR_ENTRANCE_MAKE_USABLE,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        elementIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        0,
-        0);
+        TILE_INSPECTOR_ENTRANCE_MAKE_USABLE, GAME_COMMAND_FLAG_APPLY,
+        windowTileInspectorTileX | (windowTileInspectorTileY << 8), elementIndex, GAME_COMMAND_MODIFY_TILE, 0, 0);
 }
 
 static void window_tile_inspector_wall_set_slope(int32_t elementIndex, int32_t slopeValue)
@@ -798,37 +733,22 @@ static void window_tile_inspector_wall_set_slope(int32_t elementIndex, int32_t s
     openrct2_assert((slopeValue & 0xC0) == slopeValue, "slopeValue doesn't match its mask");
 
     game_do_command(
-        TILE_INSPECTOR_WALL_SET_SLOPE,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        elementIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        slopeValue,
-        0);
+        TILE_INSPECTOR_WALL_SET_SLOPE, GAME_COMMAND_FLAG_APPLY, windowTileInspectorTileX | (windowTileInspectorTileY << 8),
+        elementIndex, GAME_COMMAND_MODIFY_TILE, slopeValue, 0);
 }
 
 static void window_tile_inspector_track_block_height_offset(int32_t elementIndex, int8_t heightOffset)
 {
     game_do_command(
-        TILE_INSPECTOR_TRACK_BASE_HEIGHT_OFFSET,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        elementIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        heightOffset,
-        0);
+        TILE_INSPECTOR_TRACK_BASE_HEIGHT_OFFSET, GAME_COMMAND_FLAG_APPLY,
+        windowTileInspectorTileX | (windowTileInspectorTileY << 8), elementIndex, GAME_COMMAND_MODIFY_TILE, heightOffset, 0);
 }
 
 static void window_tile_inspector_track_block_set_lift(int32_t elementIndex, bool entireTrackBlock, bool chain)
 {
     game_do_command(
-        TILE_INSPECTOR_TRACK_SET_CHAIN,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        elementIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        entireTrackBlock,
-        chain);
+        TILE_INSPECTOR_TRACK_SET_CHAIN, GAME_COMMAND_FLAG_APPLY, windowTileInspectorTileX | (windowTileInspectorTileY << 8),
+        elementIndex, GAME_COMMAND_MODIFY_TILE, entireTrackBlock, chain);
 }
 
 static void window_tile_inspector_quarter_tile_set(int32_t elementIndex, const int32_t quarterIndex)
@@ -837,25 +757,17 @@ static void window_tile_inspector_quarter_tile_set(int32_t elementIndex, const i
     openrct2_assert(quarterIndex >= 0 && quarterIndex < 4, "quarterIndex out of range");
 
     game_do_command(
-        TILE_INSPECTOR_SCENERY_SET_QUARTER_LOCATION,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        elementIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        (quarterIndex - get_current_rotation()) & 3,
-        0);
+        TILE_INSPECTOR_SCENERY_SET_QUARTER_LOCATION, GAME_COMMAND_FLAG_APPLY,
+        windowTileInspectorTileX | (windowTileInspectorTileY << 8), elementIndex, GAME_COMMAND_MODIFY_TILE,
+        (quarterIndex - get_current_rotation()) & 3, 0);
 }
 
 static void window_tile_inspector_toggle_quadrant_collosion(int32_t elementIndex, const int32_t quadrantIndex)
 {
     game_do_command(
-        TILE_INSPECTOR_SCENERY_SET_QUARTER_COLLISION,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        elementIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        (quadrantIndex + 2 - get_current_rotation()) & 3,
-        0);
+        TILE_INSPECTOR_SCENERY_SET_QUARTER_COLLISION, GAME_COMMAND_FLAG_APPLY,
+        windowTileInspectorTileX | (windowTileInspectorTileY << 8), elementIndex, GAME_COMMAND_MODIFY_TILE,
+        (quadrantIndex + 2 - get_current_rotation()) & 3, 0);
 }
 
 static void window_tile_inspector_banner_toggle_block(int32_t elementIndex, int32_t edgeIndex)
@@ -866,25 +778,15 @@ static void window_tile_inspector_banner_toggle_block(int32_t elementIndex, int3
     edgeIndex = (edgeIndex - get_current_rotation()) & 3;
 
     game_do_command(
-        TILE_INSPECTOR_BANNER_TOGGLE_BLOCKING_EDGE,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        elementIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        edgeIndex,
-        0);
+        TILE_INSPECTOR_BANNER_TOGGLE_BLOCKING_EDGE, GAME_COMMAND_FLAG_APPLY,
+        windowTileInspectorTileX | (windowTileInspectorTileY << 8), elementIndex, GAME_COMMAND_MODIFY_TILE, edgeIndex, 0);
 }
 
 static void window_tile_inspector_clamp_corrupt(int32_t elementIndex)
 {
     game_do_command(
-        TILE_INSPECTOR_CORRUPT_CLAMP,
-        GAME_COMMAND_FLAG_APPLY,
-        windowTileInspectorTileX | (windowTileInspectorTileY << 8),
-        elementIndex,
-        GAME_COMMAND_MODIFY_TILE,
-        0,
-        0);
+        TILE_INSPECTOR_CORRUPT_CLAMP, GAME_COMMAND_FLAG_APPLY, windowTileInspectorTileX | (windowTileInspectorTileY << 8),
+        elementIndex, GAME_COMMAND_MODIFY_TILE, 0, 0);
 }
 
 static void window_tile_inspector_mouseup(rct_window* w, rct_widgetindex widgetIndex)
@@ -1209,14 +1111,8 @@ static void window_tile_inspector_mousedown(rct_window* w, rct_widgetindex widge
                     gDropdownItemsArgs[1] = STR_TILE_INSPECTOR_WALL_SLOPED_LEFT;
                     gDropdownItemsArgs[2] = STR_TILE_INSPECTOR_WALL_SLOPED_RIGHT;
                     window_dropdown_show_text_custom_width(
-                        w->x + widget->left,
-                        w->y + widget->top,
-                        widget->bottom - widget->top + 1,
-                        w->colours[1],
-                        0,
-                        DROPDOWN_FLAG_STAY_OPEN,
-                        3,
-                        widget->right - widget->left - 3);
+                        w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0,
+                        DROPDOWN_FLAG_STAY_OPEN, 3, widget->right - widget->left - 3);
 
                     // Set current value as checked
                     rct_tile_element* const tileElement = window_tile_inspector_get_selected_element(w);
@@ -1495,13 +1391,11 @@ static void window_tile_inspector_invalidate(rct_window* w)
 
     // X and Y spinners
     widget_set_enabled(
-        w,
-        WIDX_SPINNER_X_INCREASE,
+        w, WIDX_SPINNER_X_INCREASE,
         (windowTileInspectorTileSelected && (windowTileInspectorTileX < MAXIMUM_MAP_SIZE_TECHNICAL - 1)));
     widget_set_enabled(w, WIDX_SPINNER_X_DECREASE, (windowTileInspectorTileSelected && (windowTileInspectorTileX > 0)));
     widget_set_enabled(
-        w,
-        WIDX_SPINNER_Y_INCREASE,
+        w, WIDX_SPINNER_Y_INCREASE,
         (windowTileInspectorTileSelected && (windowTileInspectorTileY < MAXIMUM_MAP_SIZE_TECHNICAL - 1)));
     widget_set_enabled(w, WIDX_SPINNER_Y_DECREASE, (windowTileInspectorTileSelected && (windowTileInspectorTileY > 0)));
 
@@ -1514,8 +1408,7 @@ static void window_tile_inspector_invalidate(rct_window* w)
 
     // Move Down button
     widget_set_enabled(
-        w,
-        WIDX_BUTTON_MOVE_DOWN,
+        w, WIDX_BUTTON_MOVE_DOWN,
         (windowTileInspectorSelectedIndex != -1 && windowTileInspectorSelectedIndex < windowTileInspectorElementCount - 1));
     widget_invalidate(w, WIDX_BUTTON_MOVE_DOWN);
 
@@ -1582,20 +1475,16 @@ static void window_tile_inspector_invalidate(rct_window* w)
             w->widgets[WIDX_SURFACE_CHECK_DIAGONAL].top = GBBT(propertiesAnchor, 3) + 7 * 1;
             w->widgets[WIDX_SURFACE_CHECK_DIAGONAL].bottom = w->widgets[WIDX_SURFACE_CHECK_DIAGONAL].top + 13;
             widget_set_checkbox_value(
-                w,
-                WIDX_SURFACE_CHECK_CORNER_N,
+                w, WIDX_SURFACE_CHECK_CORNER_N,
                 tileElement->properties.surface.slope & (1 << ((2 - get_current_rotation()) & 3)));
             widget_set_checkbox_value(
-                w,
-                WIDX_SURFACE_CHECK_CORNER_E,
+                w, WIDX_SURFACE_CHECK_CORNER_E,
                 tileElement->properties.surface.slope & (1 << ((3 - get_current_rotation()) & 3)));
             widget_set_checkbox_value(
-                w,
-                WIDX_SURFACE_CHECK_CORNER_S,
+                w, WIDX_SURFACE_CHECK_CORNER_S,
                 tileElement->properties.surface.slope & (1 << ((0 - get_current_rotation()) & 3)));
             widget_set_checkbox_value(
-                w,
-                WIDX_SURFACE_CHECK_CORNER_W,
+                w, WIDX_SURFACE_CHECK_CORNER_W,
                 tileElement->properties.surface.slope & (1 << ((1 - get_current_rotation()) & 3)));
             widget_set_checkbox_value(
                 w, WIDX_SURFACE_CHECK_DIAGONAL, tileElement->properties.surface.slope & TILE_ELEMENT_SLOPE_DOUBLE_HEIGHT);
@@ -1635,20 +1524,16 @@ static void window_tile_inspector_invalidate(rct_window* w)
             widget_set_checkbox_value(
                 w, WIDX_PATH_CHECK_EDGE_NW, tileElement->properties.path.edges & (1 << ((3 - get_current_rotation()) & 3)));
             widget_set_checkbox_value(
-                w,
-                WIDX_PATH_CHECK_EDGE_E,
+                w, WIDX_PATH_CHECK_EDGE_E,
                 tileElement->properties.path.edges & (1 << (4 + ((0 - get_current_rotation()) & 3))));
             widget_set_checkbox_value(
-                w,
-                WIDX_PATH_CHECK_EDGE_S,
+                w, WIDX_PATH_CHECK_EDGE_S,
                 tileElement->properties.path.edges & (1 << (4 + ((1 - get_current_rotation()) & 3))));
             widget_set_checkbox_value(
-                w,
-                WIDX_PATH_CHECK_EDGE_W,
+                w, WIDX_PATH_CHECK_EDGE_W,
                 tileElement->properties.path.edges & (1 << (4 + ((2 - get_current_rotation()) & 3))));
             widget_set_checkbox_value(
-                w,
-                WIDX_PATH_CHECK_EDGE_N,
+                w, WIDX_PATH_CHECK_EDGE_N,
                 tileElement->properties.path.edges & (1 << (4 + ((3 - get_current_rotation()) & 3))));
             break;
         case TILE_INSPECTOR_PAGE_TRACK:
@@ -1772,20 +1657,16 @@ static void window_tile_inspector_invalidate(rct_window* w)
             w->widgets[WIDX_BANNER_CHECK_BLOCK_NW].top = GBBT(propertiesAnchor, 1);
             w->widgets[WIDX_BANNER_CHECK_BLOCK_NW].bottom = GBBB(propertiesAnchor, 1);
             widget_set_checkbox_value(
-                w,
-                WIDX_BANNER_CHECK_BLOCK_NE,
+                w, WIDX_BANNER_CHECK_BLOCK_NE,
                 !(tileElement->properties.banner.flags & (1 << ((0 - get_current_rotation()) & 3))));
             widget_set_checkbox_value(
-                w,
-                WIDX_BANNER_CHECK_BLOCK_SE,
+                w, WIDX_BANNER_CHECK_BLOCK_SE,
                 !(tileElement->properties.banner.flags & (1 << ((1 - get_current_rotation()) & 3))));
             widget_set_checkbox_value(
-                w,
-                WIDX_BANNER_CHECK_BLOCK_SW,
+                w, WIDX_BANNER_CHECK_BLOCK_SW,
                 !(tileElement->properties.banner.flags & (1 << ((2 - get_current_rotation()) & 3))));
             widget_set_checkbox_value(
-                w,
-                WIDX_BANNER_CHECK_BLOCK_NW,
+                w, WIDX_BANNER_CHECK_BLOCK_NW,
                 !(tileElement->properties.banner.flags & (1 << ((3 - get_current_rotation()) & 3))));
             break;
         case TILE_INSPECTOR_PAGE_CORRUPT:
@@ -1813,68 +1694,38 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
     if ((widget = &w->widgets[WIDX_COLUMN_TYPE])->type != WWT_EMPTY)
     {
         gfx_draw_string_left_clipped(
-            dpi,
-            STR_TILE_INSPECTOR_ELEMENT_TYPE,
-            gCommonFormatArgs,
-            w->colours[1],
-            w->x + widget->left + 1,
-            w->y + widget->top + 1,
-            widget->right - widget->left);
+            dpi, STR_TILE_INSPECTOR_ELEMENT_TYPE, gCommonFormatArgs, w->colours[1], w->x + widget->left + 1,
+            w->y + widget->top + 1, widget->right - widget->left);
     }
     if ((widget = &w->widgets[WIDX_COLUMN_BASEHEIGHT])->type != WWT_EMPTY)
     {
         gfx_draw_string_left_clipped(
-            dpi,
-            STR_TILE_INSPECTOR_BASE_HEIGHT_SHORT,
-            gCommonFormatArgs,
-            w->colours[1],
-            w->x + widget->left + 1,
-            w->y + widget->top + 1,
-            widget->right - widget->left);
+            dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_SHORT, gCommonFormatArgs, w->colours[1], w->x + widget->left + 1,
+            w->y + widget->top + 1, widget->right - widget->left);
     }
     if ((widget = &w->widgets[WIDX_COLUMN_CLEARANCEHEIGHT])->type != WWT_EMPTY)
     {
         gfx_draw_string_left_clipped(
-            dpi,
-            STR_TILE_INSPECTOR_CLEARANGE_HEIGHT_SHORT,
-            gCommonFormatArgs,
-            w->colours[1],
-            w->x + widget->left + 1,
-            w->y + widget->top + 1,
-            widget->right - widget->left);
+            dpi, STR_TILE_INSPECTOR_CLEARANGE_HEIGHT_SHORT, gCommonFormatArgs, w->colours[1], w->x + widget->left + 1,
+            w->y + widget->top + 1, widget->right - widget->left);
     }
     if ((widget = &w->widgets[WIDX_COLUMN_GHOSTFLAG])->type != WWT_EMPTY)
     {
         gfx_draw_string_left_clipped(
-            dpi,
-            STR_TILE_INSPECTOR_FLAG_GHOST_SHORT,
-            gCommonFormatArgs,
-            w->colours[1],
-            w->x + widget->left + 1,
-            w->y + widget->top + 1,
-            widget->right - widget->left);
+            dpi, STR_TILE_INSPECTOR_FLAG_GHOST_SHORT, gCommonFormatArgs, w->colours[1], w->x + widget->left + 1,
+            w->y + widget->top + 1, widget->right - widget->left);
     }
     if ((widget = &w->widgets[WIDX_COLUMN_BROKENFLAG])->type != WWT_EMPTY)
     {
         gfx_draw_string_left_clipped(
-            dpi,
-            STR_TILE_INSPECTOR_FLAG_BROKEN_SHORT,
-            gCommonFormatArgs,
-            w->colours[1],
-            w->x + widget->left + 1,
-            w->y + widget->top + 1,
-            widget->right - widget->left);
+            dpi, STR_TILE_INSPECTOR_FLAG_BROKEN_SHORT, gCommonFormatArgs, w->colours[1], w->x + widget->left + 1,
+            w->y + widget->top + 1, widget->right - widget->left);
     }
     if ((widget = &w->widgets[WIDX_COLUMN_LASTFLAG])->type != WWT_EMPTY)
     {
         gfx_draw_string_left_clipped(
-            dpi,
-            STR_TILE_INSPECTOR_FLAG_LAST_SHORT,
-            gCommonFormatArgs,
-            w->colours[1],
-            w->x + widget->left + 1,
-            w->y + widget->top + 1,
-            widget->right - widget->left);
+            dpi, STR_TILE_INSPECTOR_FLAG_LAST_SHORT, gCommonFormatArgs, w->colours[1], w->x + widget->left + 1,
+            w->y + widget->top + 1, widget->right - widget->left);
     }
 
     // Draw coordinates
@@ -1913,8 +1764,7 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
                 int32_t idx = surface_get_terrain_edge(tileElement);
                 openrct2_assert(
                     (uint32_t)idx < Util::CountOf(TerrainEdgeTypeStringIds),
-                    "Tried accessing invalid entry %d in terrainEdgeTypeStringIds",
-                    idx);
+                    "Tried accessing invalid entry %d in terrainEdgeTypeStringIds", idx);
                 rct_string_id terrainEdgeNameId = TerrainEdgeTypeStringIds[surface_get_terrain_edge(tileElement)];
                 gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_EDGE, &terrainEdgeNameId, COLOUR_DARK_GREEN, x, y + 11);
 
@@ -2136,12 +1986,8 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi)
                 if (wallEntry.flags & WALL_SCENERY_IS_BANNER)
                 {
                     gfx_draw_string_left(
-                        dpi,
-                        STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT,
-                        &gBanners[tileElement->properties.wall.banner_index].string_idx,
-                        COLOUR_DARK_GREEN,
-                        x,
-                        y + 11);
+                        dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT,
+                        &gBanners[tileElement->properties.wall.banner_index].string_idx, COLOUR_DARK_GREEN, x, y + 11);
                 }
                 else
                 {
@@ -2301,10 +2147,7 @@ static void window_tile_inspector_scrollpaint(rct_window* w, rct_drawpixelinfo*
                 break;
             case TILE_ELEMENT_TYPE_SMALL_SCENERY:
                 snprintf(
-                    buffer,
-                    sizeof(buffer),
-                    "%s (%s)",
-                    language_get_string(STR_OBJECT_SELECTION_SMALL_SCENERY),
+                    buffer, sizeof(buffer), "%s (%s)", language_get_string(STR_OBJECT_SELECTION_SMALL_SCENERY),
                     language_get_string(get_small_scenery_entry(tileElement->properties.scenery.type)->name));
                 typeName = buffer;
                 break;
@@ -2313,10 +2156,7 @@ static void window_tile_inspector_scrollpaint(rct_window* w, rct_drawpixelinfo*
                 break;
             case TILE_ELEMENT_TYPE_WALL:
                 snprintf(
-                    buffer,
-                    sizeof(buffer),
-                    "%s (%s)",
-                    language_get_string(STR_TILE_INSPECTOR_WALL),
+                    buffer, sizeof(buffer), "%s (%s)", language_get_string(STR_TILE_INSPECTOR_WALL),
                     language_get_string(get_wall_entry(tileElement->properties.scenery.type)->name));
                 typeName = buffer;
                 break;
@@ -2325,10 +2165,7 @@ static void window_tile_inspector_scrollpaint(rct_window* w, rct_drawpixelinfo*
                 break;
             case TILE_ELEMENT_TYPE_BANNER:
                 snprintf(
-                    buffer,
-                    sizeof(buffer),
-                    "%s (%d)",
-                    language_get_string(STR_BANNER_WINDOW_TITLE),
+                    buffer, sizeof(buffer), "%s (%d)", language_get_string(STR_BANNER_WINDOW_TITLE),
                     tileElement->properties.banner.index);
                 typeName = buffer;
                 break;
diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp
index 81a8ecf26e..98bbe0eed1 100644
--- a/src/openrct2-ui/windows/TitleCommandEditor.cpp
+++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp
@@ -197,15 +197,8 @@ static LocationXY16 get_location()
         rct_tile_element* tileElement;
 
         get_map_coordinates_from_pos_window(
-            w,
-            w->viewport->view_width / 2,
-            w->viewport->view_height / 2,
-            VIEWPORT_INTERACTION_MASK_TERRAIN,
-            &mapCoord.x,
-            &mapCoord.y,
-            &interactionType,
-            &tileElement,
-            nullptr);
+            w, w->viewport->view_width / 2, w->viewport->view_height / 2, VIEWPORT_INTERACTION_MASK_TERRAIN, &mapCoord.x,
+            &mapCoord.y, &interactionType, &tileElement, nullptr);
         mapCoord.x -= 16;
         mapCoord.x /= 32;
         mapCoord.y -= 16;
@@ -257,17 +250,8 @@ void window_title_command_editor_open(TitleSequence* sequence, int32_t index, bo
 
     rct_widget* const viewportWidget = &window_title_command_editor_widgets[WIDX_VIEWPORT];
     viewport_create(
-        window,
-        window->x + viewportWidget->left + 1,
-        window->y + viewportWidget->top + 1,
-        viewportWidget->right - viewportWidget->left - 1,
-        viewportWidget->bottom - viewportWidget->top - 1,
-        0,
-        0,
-        0,
-        0,
-        0,
-        -1);
+        window, window->x + viewportWidget->left + 1, window->y + viewportWidget->top + 1,
+        viewportWidget->right - viewportWidget->left - 1, viewportWidget->bottom - viewportWidget->top - 1, 0, 0, 0, 0, 0, -1);
 
     _window_title_command_editor_index = index;
     _window_title_command_editor_insert = insert;
@@ -410,14 +394,8 @@ static void window_title_command_editor_mousedown(rct_window* w, rct_widgetindex
             }
 
             window_dropdown_show_text_custom_width(
-                w->x + widget->left,
-                w->y + widget->top,
-                widget->bottom - widget->top + 1,
-                w->colours[1],
-                0,
-                DROPDOWN_FLAG_STAY_OPEN,
-                numItems,
-                widget->right - widget->left - 3);
+                w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0,
+                DROPDOWN_FLAG_STAY_OPEN, numItems, widget->right - widget->left - 3);
 
             dropdown_set_checked(get_command_info_index(command.Type), true);
             break;
@@ -433,14 +411,8 @@ static void window_title_command_editor_mousedown(rct_window* w, rct_widgetindex
                 }
 
                 window_dropdown_show_text_custom_width(
-                    w->x + widget->left,
-                    w->y + widget->top,
-                    widget->bottom - widget->top + 1,
-                    w->colours[1],
-                    0,
-                    DROPDOWN_FLAG_STAY_OPEN,
-                    numItems,
-                    widget->right - widget->left - 3);
+                    w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0,
+                    DROPDOWN_FLAG_STAY_OPEN, numItems, widget->right - widget->left - 3);
 
                 dropdown_set_checked(command.Speed - 1, true);
             }
@@ -454,14 +426,8 @@ static void window_title_command_editor_mousedown(rct_window* w, rct_widgetindex
                 }
 
                 window_dropdown_show_text_custom_width(
-                    w->x + widget->left,
-                    w->y + widget->top,
-                    widget->bottom - widget->top + 1,
-                    w->colours[1],
-                    0,
-                    DROPDOWN_FLAG_STAY_OPEN,
-                    numItems,
-                    widget->right - widget->left - 3);
+                    w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0,
+                    DROPDOWN_FLAG_STAY_OPEN, numItems, widget->right - widget->left - 3);
 
                 dropdown_set_checked(command.SaveIndex, true);
             }
@@ -772,13 +738,8 @@ static void window_title_command_editor_paint(rct_window* w, rct_drawpixelinfo*
 
     // Command dropdown name
     gfx_draw_string_left_clipped(
-        dpi,
-        command_info.nameStringId,
-        nullptr,
-        w->colours[1],
-        w->x + w->widgets[WIDX_COMMAND].left + 1,
-        w->y + w->widgets[WIDX_COMMAND].top,
-        w->widgets[WIDX_COMMAND_DROPDOWN].left - w->widgets[WIDX_COMMAND].left - 4);
+        dpi, command_info.nameStringId, nullptr, w->colours[1], w->x + w->widgets[WIDX_COMMAND].left + 1,
+        w->y + w->widgets[WIDX_COMMAND].top, w->widgets[WIDX_COMMAND_DROPDOWN].left - w->widgets[WIDX_COMMAND].left - 4);
 
     // Label (e.g. "Location:")
     gfx_draw_string_left(dpi, command_info.descStringId, nullptr, w->colours[1], w->x + WS, w->y + BY2 - 14);
@@ -786,13 +747,8 @@ static void window_title_command_editor_paint(rct_window* w, rct_drawpixelinfo*
     if (command.Type == TITLE_SCRIPT_SPEED)
     {
         gfx_draw_string_left_clipped(
-            dpi,
-            SpeedNames[command.Speed - 1],
-            nullptr,
-            w->colours[1],
-            w->x + w->widgets[WIDX_INPUT].left + 1,
-            w->y + w->widgets[WIDX_INPUT].top,
-            w->widgets[WIDX_INPUT_DROPDOWN].left - w->widgets[WIDX_INPUT].left - 4);
+            dpi, SpeedNames[command.Speed - 1], nullptr, w->colours[1], w->x + w->widgets[WIDX_INPUT].left + 1,
+            w->y + w->widgets[WIDX_INPUT].top, w->widgets[WIDX_INPUT_DROPDOWN].left - w->widgets[WIDX_INPUT].left - 4);
     }
     if (command.Type == TITLE_SCRIPT_FOLLOW)
     {
@@ -810,43 +766,26 @@ static void window_title_command_editor_paint(rct_window* w, rct_drawpixelinfo*
         }
 
         gfx_set_dirty_blocks(
-            w->x + w->widgets[WIDX_VIEWPORT].left,
-            w->y + w->widgets[WIDX_VIEWPORT].top,
-            w->x + w->widgets[WIDX_VIEWPORT].right,
+            w->x + w->widgets[WIDX_VIEWPORT].left, w->y + w->widgets[WIDX_VIEWPORT].top, w->x + w->widgets[WIDX_VIEWPORT].right,
             w->y + w->widgets[WIDX_VIEWPORT].bottom);
         gfx_draw_string_left_clipped(
-            dpi,
-            spriteString,
-            gCommonFormatArgs,
-            colour,
-            w->x + w->widgets[WIDX_VIEWPORT].left + 2,
-            w->y + w->widgets[WIDX_VIEWPORT].top + 1,
-            w->widgets[WIDX_VIEWPORT].right - w->widgets[WIDX_VIEWPORT].left - 2);
+            dpi, spriteString, gCommonFormatArgs, colour, w->x + w->widgets[WIDX_VIEWPORT].left + 2,
+            w->y + w->widgets[WIDX_VIEWPORT].top + 1, w->widgets[WIDX_VIEWPORT].right - w->widgets[WIDX_VIEWPORT].left - 2);
     }
     else if (command.Type == TITLE_SCRIPT_LOAD)
     {
         if (command.SaveIndex == SAVE_INDEX_INVALID)
         {
             gfx_draw_string_left_clipped(
-                dpi,
-                STR_TITLE_COMMAND_EDITOR_NO_SAVE_SELECTED,
-                nullptr,
-                w->colours[1],
-                w->x + w->widgets[WIDX_INPUT].left + 1,
-                w->y + w->widgets[WIDX_INPUT].top,
-                w->widgets[WIDX_INPUT_DROPDOWN].left - w->widgets[WIDX_INPUT].left - 4);
+                dpi, STR_TITLE_COMMAND_EDITOR_NO_SAVE_SELECTED, nullptr, w->colours[1], w->x + w->widgets[WIDX_INPUT].left + 1,
+                w->y + w->widgets[WIDX_INPUT].top, w->widgets[WIDX_INPUT_DROPDOWN].left - w->widgets[WIDX_INPUT].left - 4);
         }
         else
         {
             set_format_arg(0, uintptr_t, (uintptr_t)_sequence->Saves[command.SaveIndex]);
             gfx_draw_string_left_clipped(
-                dpi,
-                STR_STRING,
-                gCommonFormatArgs,
-                w->colours[1],
-                w->x + w->widgets[WIDX_INPUT].left + 1,
-                w->y + w->widgets[WIDX_INPUT].top,
-                w->widgets[WIDX_INPUT_DROPDOWN].left - w->widgets[WIDX_INPUT].left - 4);
+                dpi, STR_STRING, gCommonFormatArgs, w->colours[1], w->x + w->widgets[WIDX_INPUT].left + 1,
+                w->y + w->widgets[WIDX_INPUT].top, w->widgets[WIDX_INPUT_DROPDOWN].left - w->widgets[WIDX_INPUT].left - 4);
         }
     }
     else if (command.Type == TITLE_SCRIPT_LOADSC)
@@ -854,12 +793,8 @@ static void window_title_command_editor_paint(rct_window* w, rct_drawpixelinfo*
         if (command.Scenario[0] == '\0')
         {
             gfx_draw_string_left_clipped(
-                dpi,
-                STR_TITLE_COMMAND_EDITOR_NO_SCENARIO_SELECTED,
-                nullptr,
-                w->colours[1],
-                w->x + w->widgets[WIDX_INPUT].left + 1,
-                w->y + w->widgets[WIDX_INPUT].top,
+                dpi, STR_TITLE_COMMAND_EDITOR_NO_SCENARIO_SELECTED, nullptr, w->colours[1],
+                w->x + w->widgets[WIDX_INPUT].left + 1, w->y + w->widgets[WIDX_INPUT].top,
                 w->widgets[WIDX_INPUT_DROPDOWN].left - w->widgets[WIDX_INPUT].left - 4);
         }
         else
@@ -877,13 +812,8 @@ static void window_title_command_editor_paint(rct_window* w, rct_drawpixelinfo*
             }
             set_format_arg(0, uintptr_t, name);
             gfx_draw_string_left_clipped(
-                dpi,
-                nameString,
-                gCommonFormatArgs,
-                w->colours[1],
-                w->x + w->widgets[WIDX_INPUT].left + 1,
-                w->y + w->widgets[WIDX_INPUT].top,
-                w->widgets[WIDX_INPUT_DROPDOWN].left - w->widgets[WIDX_INPUT].left - 4);
+                dpi, nameString, gCommonFormatArgs, w->colours[1], w->x + w->widgets[WIDX_INPUT].left + 1,
+                w->y + w->widgets[WIDX_INPUT].top, w->widgets[WIDX_INPUT_DROPDOWN].left - w->widgets[WIDX_INPUT].left - 4);
         }
     }
 }
diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp
index ef0162b3aa..50e690a6d4 100644
--- a/src/openrct2-ui/windows/TitleEditor.cpp
+++ b/src/openrct2-ui/windows/TitleEditor.cpp
@@ -296,12 +296,7 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
             {
                 // TODO: This should probably be 'NEW'
                 window_text_input_open(
-                    w,
-                    widgetIndex,
-                    STR_TITLE_EDITOR_ACTION_DUPLICATE,
-                    STR_TITLE_EDITOR_ENTER_NAME_FOR_SEQUENCE,
-                    STR_NONE,
-                    0,
+                    w, widgetIndex, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_TITLE_EDITOR_ENTER_NAME_FOR_SEQUENCE, STR_NONE, 0,
                     64);
             }
             break;
@@ -309,13 +304,8 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
             if (!commandEditorOpen && _editingTitleSequence != nullptr)
             {
                 window_text_input_open(
-                    w,
-                    widgetIndex,
-                    STR_TITLE_EDITOR_ACTION_DUPLICATE,
-                    STR_TITLE_EDITOR_ENTER_NAME_FOR_SEQUENCE,
-                    STR_STRING,
-                    (uintptr_t)_sequenceName,
-                    64);
+                    w, widgetIndex, STR_TITLE_EDITOR_ACTION_DUPLICATE, STR_TITLE_EDITOR_ENTER_NAME_FOR_SEQUENCE, STR_STRING,
+                    (uintptr_t)_sequenceName, 64);
             }
             break;
         case WIDX_TITLE_EDITOR_DELETE_BUTTON:
@@ -329,13 +319,8 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
             if (window_title_editor_check_can_edit() && _editingTitleSequence != nullptr)
             {
                 window_text_input_open(
-                    w,
-                    widgetIndex,
-                    STR_TRACK_MANAGE_RENAME,
-                    STR_TITLE_EDITOR_ENTER_NAME_FOR_SEQUENCE,
-                    STR_STRING,
-                    (uintptr_t)_sequenceName,
-                    64);
+                    w, widgetIndex, STR_TRACK_MANAGE_RENAME, STR_TITLE_EDITOR_ENTER_NAME_FOR_SEQUENCE, STR_STRING,
+                    (uintptr_t)_sequenceName, 64);
             }
             break;
 
@@ -370,13 +355,8 @@ static void window_title_editor_mouseup(rct_window* w, rct_widgetindex widgetInd
                 if (w->selected_list_item != -1)
                 {
                     window_text_input_open(
-                        w,
-                        widgetIndex,
-                        STR_FILEBROWSER_RENAME_SAVE_TITLE,
-                        STR_TITLE_EDITOR_ENTER_NAME_FOR_SAVE,
-                        STR_STRING,
-                        (uintptr_t)_editingTitleSequence->Saves[w->selected_list_item],
-                        52 - 1);
+                        w, widgetIndex, STR_FILEBROWSER_RENAME_SAVE_TITLE, STR_TITLE_EDITOR_ENTER_NAME_FOR_SAVE, STR_STRING,
+                        (uintptr_t)_editingTitleSequence->Saves[w->selected_list_item], 52 - 1);
                 }
             }
             break;
@@ -572,14 +552,8 @@ static void window_title_editor_mousedown(rct_window* w, rct_widgetindex widgetI
 
                 widget--;
                 window_dropdown_show_text_custom_width(
-                    w->x + widget->left,
-                    w->y + widget->top,
-                    widget->bottom - widget->top + 1,
-                    w->colours[1],
-                    0,
-                    DROPDOWN_FLAG_STAY_OPEN,
-                    numItems,
-                    widget->right - widget->left - 3);
+                    w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1], 0,
+                    DROPDOWN_FLAG_STAY_OPEN, numItems, widget->right - widget->left - 3);
                 dropdown_set_checked((int32_t)_selectedTitleSequence, true);
             }
             break;
@@ -855,17 +829,10 @@ static void window_title_editor_paint(rct_window* w, rct_drawpixelinfo* dpi)
         case WINDOW_TITLE_EDITOR_TAB_PRESETS:
             set_format_arg(0, uintptr_t, _sequenceName);
             gfx_draw_string_left(
-                dpi,
-                STR_TITLE_SEQUENCE,
-                nullptr,
-                w->colours[1],
-                w->x + 10,
+                dpi, STR_TITLE_SEQUENCE, nullptr, w->colours[1], w->x + 10,
                 w->y + window_title_editor_widgets[WIDX_TITLE_EDITOR_PRESETS].top + 1);
             gfx_draw_string_left_clipped(
-                dpi,
-                STR_STRING,
-                gCommonFormatArgs,
-                w->colours[1],
+                dpi, STR_STRING, gCommonFormatArgs, w->colours[1],
                 w->x + window_title_editor_widgets[WIDX_TITLE_EDITOR_PRESETS].left + 1,
                 w->y + window_title_editor_widgets[WIDX_TITLE_EDITOR_PRESETS].top,
                 w->x + window_title_editor_widgets[WIDX_TITLE_EDITOR_PRESETS_DROPDOWN].left
@@ -921,11 +888,7 @@ static void window_title_editor_scrollpaint_saves(rct_window* w, rct_drawpixelin
         else if (i & 1)
         {
             gfx_fill_rect(
-                dpi,
-                x,
-                y,
-                x + SCROLL_WIDTH + 100,
-                y + SCROLLABLE_ROW_HEIGHT - 1,
+                dpi, x, y, x + SCROLL_WIDTH + 100, y + SCROLLABLE_ROW_HEIGHT - 1,
                 ColourMapA[w->colours[1]].lighter | 0x1000000);
         }
 
@@ -975,11 +938,7 @@ static void window_title_editor_scrollpaint_commands(rct_window* w, rct_drawpixe
         else if (i & 1)
         {
             gfx_fill_rect(
-                dpi,
-                x,
-                y,
-                x + SCROLL_WIDTH + 100,
-                y + SCROLLABLE_ROW_HEIGHT - 1,
+                dpi, x, y, x + SCROLL_WIDTH + 100, y + SCROLLABLE_ROW_HEIGHT - 1,
                 ColourMapA[w->colours[1]].lighter | 0x1000000);
         }
 
@@ -1107,11 +1066,8 @@ static void window_title_editor_draw_tab_images(rct_drawpixelinfo* dpi, rct_wind
             y = 1;
         }
         gfx_draw_sprite(
-            dpi,
-            spriteId,
-            w->x + w->widgets[WIDX_TITLE_EDITOR_PRESETS_TAB + i].left + x,
-            w->y + w->widgets[WIDX_TITLE_EDITOR_PRESETS_TAB + i].top + y,
-            0);
+            dpi, spriteId, w->x + w->widgets[WIDX_TITLE_EDITOR_PRESETS_TAB + i].left + x,
+            w->y + w->widgets[WIDX_TITLE_EDITOR_PRESETS_TAB + i].top + y, 0);
     }
 }
 
@@ -1186,13 +1142,8 @@ static void window_title_editor_add_park_callback(int32_t result, const utf8* pa
         // set_format_arg(0, intptr_t, (intptr_t)&_renameSavePath);
         rct_window* w = window_find_by_class(WC_TITLE_EDITOR);
         window_text_input_open(
-            w,
-            WIDX_TITLE_EDITOR_RENAME_SAVE,
-            STR_FILEBROWSER_RENAME_SAVE_TITLE,
-            STR_ERROR_EXISTING_NAME,
-            STR_STRING,
-            (uintptr_t)_renameSavePath,
-            52 - 1);
+            w, WIDX_TITLE_EDITOR_RENAME_SAVE, STR_FILEBROWSER_RENAME_SAVE_TITLE, STR_ERROR_EXISTING_NAME, STR_STRING,
+            (uintptr_t)_renameSavePath, 52 - 1);
         return;
     }
 
diff --git a/src/openrct2-ui/windows/TitleExit.cpp b/src/openrct2-ui/windows/TitleExit.cpp
index e4956fc6e5..a8da964a7f 100644
--- a/src/openrct2-ui/windows/TitleExit.cpp
+++ b/src/openrct2-ui/windows/TitleExit.cpp
@@ -69,12 +69,7 @@ rct_window* window_title_exit_open()
     rct_window* window;
 
     window = window_create(
-        context_get_width() - 40,
-        context_get_height() - 64,
-        40,
-        64,
-        &window_title_exit_events,
-        WC_TITLE_EXIT,
+        context_get_width() - 40, context_get_height() - 64, 40, 64, &window_title_exit_events, WC_TITLE_EXIT,
         WF_STICK_TO_BACK | WF_TRANSPARENT);
     window->widgets = window_title_exit_widgets;
     window->enabled_widgets |= (1ULL << WIDX_EXIT);
diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp
index 6483abb1e8..0338efd17a 100644
--- a/src/openrct2-ui/windows/TitleMenu.cpp
+++ b/src/openrct2-ui/windows/TitleMenu.cpp
@@ -82,12 +82,7 @@ rct_window* window_title_menu_open()
     rct_window* window;
 
     window = window_create(
-        0,
-        context_get_height() - 142,
-        0,
-        100,
-        &window_title_menu_events,
-        WC_TITLE_MENU,
+        0, context_get_height() - 142, 0, 100, &window_title_menu_events, WC_TITLE_MENU,
         WF_STICK_TO_BACK | WF_TRANSPARENT | WF_NO_BACKGROUND);
     window->widgets = window_title_menu_widgets;
     window->enabled_widgets
@@ -184,12 +179,8 @@ static void window_title_menu_mousedown(rct_window* w, rct_widgetindex widgetInd
         gDropdownItemsFormat[2] = STR_ROLLER_COASTER_DESIGNER;
         gDropdownItemsFormat[3] = STR_TRACK_DESIGNS_MANAGER;
         window_dropdown_show_text(
-            w->x + widget->left,
-            w->y + widget->top,
-            widget->bottom - widget->top + 1,
-            TRANSLUCENT(w->colours[0]),
-            DROPDOWN_FLAG_STAY_OPEN,
-            4);
+            w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, TRANSLUCENT(w->colours[0]),
+            DROPDOWN_FLAG_STAY_OPEN, 4);
     }
 }
 
diff --git a/src/openrct2-ui/windows/TitleScenarioSelect.cpp b/src/openrct2-ui/windows/TitleScenarioSelect.cpp
index cf841137f0..3f46b148fc 100644
--- a/src/openrct2-ui/windows/TitleScenarioSelect.cpp
+++ b/src/openrct2-ui/windows/TitleScenarioSelect.cpp
@@ -182,10 +182,7 @@ rct_window* window_scenarioselect_open(scenarioselect_callback callback, bool ti
         windowWidth = 733;
 
     window = window_create_centred(
-        windowWidth,
-        windowHeight,
-        &window_scenarioselect_events,
-        WC_SCENARIO_SELECT,
+        windowWidth, windowHeight, &window_scenarioselect_events, WC_SCENARIO_SELECT,
         WF_10 | (titleEditor ? WF_STICK_TO_FRONT : 0));
     window->widgets = window_scenarioselect_widgets;
     window->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_TAB1) | (1 << WIDX_TAB2) | (1 << WIDX_TAB3) | (1 << WIDX_TAB4)
diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp
index 183af8a3fa..8937218a23 100644
--- a/src/openrct2-ui/windows/TopToolbar.cpp
+++ b/src/openrct2-ui/windows/TopToolbar.cpp
@@ -305,12 +305,7 @@ static colour_t _tertiaryColour;
 rct_window* window_top_toolbar_open()
 {
     rct_window* window = window_create(
-        0,
-        0,
-        context_get_width(),
-        TOP_TOOLBAR_HEIGHT + 1,
-        &window_top_toolbar_events,
-        WC_TOP_TOOLBAR,
+        0, 0, context_get_width(), TOP_TOOLBAR_HEIGHT + 1, &window_top_toolbar_events, WC_TOP_TOOLBAR,
         WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_NO_BACKGROUND);
     window->widgets = window_top_toolbar_widgets;
 
@@ -461,12 +456,8 @@ static void window_top_toolbar_mousedown(rct_window* w, rct_widgetindex widgetIn
 #endif
             }
             window_dropdown_show_text(
-                w->x + widget->left,
-                w->y + widget->top,
-                widget->bottom - widget->top + 1,
-                w->colours[0] | 0x80,
-                DROPDOWN_FLAG_STAY_OPEN,
-                numItems);
+                w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[0] | 0x80,
+                DROPDOWN_FLAG_STAY_OPEN, numItems);
 
 #ifndef DISABLE_TWITCH
             if (_menuDropdownIncludesTwitch && gTwitchEnable)
@@ -633,23 +624,13 @@ static void window_top_toolbar_dropdown(rct_window* w, rct_widgetindex widgetInd
                     break;
                 case DDIDX_DISABLE_CLEARANCE_CHECKS:
                     game_do_command(
-                        0,
-                        GAME_COMMAND_FLAG_APPLY,
-                        CHEAT_DISABLECLEARANCECHECKS,
-                        !gCheatsDisableClearanceChecks,
-                        GAME_COMMAND_CHEAT,
-                        0,
-                        0);
+                        0, GAME_COMMAND_FLAG_APPLY, CHEAT_DISABLECLEARANCECHECKS, !gCheatsDisableClearanceChecks,
+                        GAME_COMMAND_CHEAT, 0, 0);
                     break;
                 case DDIDX_DISABLE_SUPPORT_LIMITS:
                     game_do_command(
-                        0,
-                        GAME_COMMAND_FLAG_APPLY,
-                        CHEAT_DISABLESUPPORTLIMITS,
-                        !gCheatsDisableSupportLimits,
-                        GAME_COMMAND_CHEAT,
-                        0,
-                        0);
+                        0, GAME_COMMAND_FLAG_APPLY, CHEAT_DISABLESUPPORTLIMITS, !gCheatsDisableSupportLimits,
+                        GAME_COMMAND_CHEAT, 0, 0);
                     break;
             }
             break;
@@ -1012,12 +993,8 @@ static void repaint_scenery_tool_down(int16_t x, int16_t y, rct_widgetindex widg
 
             gGameCommandErrorTitle = STR_CANT_REPAINT_THIS;
             game_do_command(
-                grid_x,
-                1 | (tile_element->type << 8),
-                grid_y,
-                tile_element->base_height | (tile_element->properties.scenery.type << 8),
-                GAME_COMMAND_SET_SCENERY_COLOUR,
-                0,
+                grid_x, 1 | (tile_element->type << 8), grid_y,
+                tile_element->base_height | (tile_element->properties.scenery.type << 8), GAME_COMMAND_SET_SCENERY_COLOUR, 0,
                 gWindowSceneryPrimaryColour | (gWindowScenerySecondaryColour << 8));
             break;
         }
@@ -1031,13 +1008,9 @@ static void repaint_scenery_tool_down(int16_t x, int16_t y, rct_widgetindex widg
 
             gGameCommandErrorTitle = STR_CANT_REPAINT_THIS;
             game_do_command(
-                grid_x,
-                1 | (gWindowSceneryPrimaryColour << 8),
-                grid_y,
+                grid_x, 1 | (gWindowSceneryPrimaryColour << 8), grid_y,
                 (tile_element->type & TILE_ELEMENT_DIRECTION_MASK) | (tile_element->base_height << 8),
-                GAME_COMMAND_SET_WALL_COLOUR,
-                0,
-                gWindowScenerySecondaryColour | (gWindowSceneryTertiaryColour << 8));
+                GAME_COMMAND_SET_WALL_COLOUR, 0, gWindowScenerySecondaryColour | (gWindowSceneryTertiaryColour << 8));
             break;
         }
         case VIEWPORT_INTERACTION_ITEM_LARGE_SCENERY:
@@ -1050,13 +1023,9 @@ static void repaint_scenery_tool_down(int16_t x, int16_t y, rct_widgetindex widg
 
             gGameCommandErrorTitle = STR_CANT_REPAINT_THIS;
             game_do_command(
-                grid_x,
-                1 | (tile_element->GetDirection() << 8),
-                grid_y,
+                grid_x, 1 | (tile_element->GetDirection() << 8), grid_y,
                 tile_element->base_height | (scenery_large_get_sequence(tile_element) << 8),
-                GAME_COMMAND_SET_LARGE_SCENERY_COLOUR,
-                0,
-                gWindowSceneryPrimaryColour | (gWindowScenerySecondaryColour << 8));
+                GAME_COMMAND_SET_LARGE_SCENERY_COLOUR, 0, gWindowSceneryPrimaryColour | (gWindowScenerySecondaryColour << 8));
             break;
         }
         case VIEWPORT_INTERACTION_ITEM_BANNER:
@@ -1067,13 +1036,8 @@ static void repaint_scenery_tool_down(int16_t x, int16_t y, rct_widgetindex widg
             {
                 gGameCommandErrorTitle = STR_CANT_REPAINT_THIS;
                 game_do_command(
-                    grid_x,
-                    1,
-                    grid_y,
-                    tile_element->base_height | ((tile_element->properties.banner.position & 0x3) << 8),
-                    GAME_COMMAND_SET_BANNER_COLOUR,
-                    0,
-                    gWindowSceneryPrimaryColour | (gWindowScenerySecondaryColour << 8));
+                    grid_x, 1, grid_y, tile_element->base_height | ((tile_element->properties.banner.position & 0x3) << 8),
+                    GAME_COMMAND_SET_BANNER_COLOUR, 0, gWindowSceneryPrimaryColour | (gWindowScenerySecondaryColour << 8));
             }
             break;
         }
@@ -1189,14 +1153,8 @@ static void scenery_eyedropper_tool_down(int16_t x, int16_t y, rct_widgetindex w
  * edi : parameter_3
  */
 static void sub_6E1F34(
-    int16_t x,
-    int16_t y,
-    uint16_t selected_scenery,
-    int16_t* grid_x,
-    int16_t* grid_y,
-    uint32_t* parameter_1,
-    uint32_t* parameter_2,
-    uint32_t* parameter_3)
+    int16_t x, int16_t y, uint16_t selected_scenery, int16_t* grid_x, int16_t* grid_y, uint32_t* parameter_1,
+    uint32_t* parameter_2, uint32_t* parameter_3)
 {
     rct_window* w = window_find_by_class(WC_SCENERY);
 
@@ -1726,13 +1684,8 @@ static void window_top_toolbar_scenery_tool_down(int16_t x, int16_t y, rct_windo
                     gDisableErrorWindowSound = true;
                     gGameCommandErrorTitle = STR_CANT_POSITION_THIS_HERE;
                     int32_t cost = game_do_command(
-                        cur_grid_x,
-                        flags,
-                        cur_grid_y,
-                        parameter_2,
-                        GAME_COMMAND_PLACE_SCENERY,
-                        gSceneryPlaceRotation | (parameter_3 & 0xFFFF0000),
-                        gSceneryPlaceZ);
+                        cur_grid_x, flags, cur_grid_y, parameter_2, GAME_COMMAND_PLACE_SCENERY,
+                        gSceneryPlaceRotation | (parameter_3 & 0xFFFF0000), gSceneryPlaceZ);
                     gDisableErrorWindowSound = false;
 
                     if (cost != MONEY32_UNDEFINED)
@@ -1804,12 +1757,7 @@ static void window_top_toolbar_scenery_tool_down(int16_t x, int16_t y, rct_windo
                 gDisableErrorWindowSound = true;
                 gGameCommandErrorTitle = STR_CANT_BUILD_PARK_ENTRANCE_HERE;
                 int32_t cost = game_do_command(
-                    gridX,
-                    flags,
-                    gridY,
-                    parameter_2,
-                    GAME_COMMAND_PLACE_WALL,
-                    gSceneryPlaceZ,
+                    gridX, flags, gridY, parameter_2, GAME_COMMAND_PLACE_WALL, gSceneryPlaceZ,
                     _secondaryColour | (_tertiaryColour << 8));
                 gDisableErrorWindowSound = false;
 
@@ -2319,14 +2267,8 @@ static void top_toolbar_tool_update_water(int16_t x, int16_t y)
     LocationXY16 mapTile = {};
     int32_t interaction_type = 0;
     get_map_coordinates_from_pos(
-        x,
-        y,
-        VIEWPORT_INTERACTION_MASK_TERRAIN & VIEWPORT_INTERACTION_MASK_WATER,
-        &mapTile.x,
-        &mapTile.y,
-        &interaction_type,
-        nullptr,
-        nullptr);
+        x, y, VIEWPORT_INTERACTION_MASK_TERRAIN & VIEWPORT_INTERACTION_MASK_WATER, &mapTile.x, &mapTile.y, &interaction_type,
+        nullptr, nullptr);
 
     if (interaction_type == VIEWPORT_INTERACTION_ITEM_NONE)
     {
@@ -2431,12 +2373,7 @@ static money32 try_place_ghost_scenery(
             // Small Scenery
             // 6e252b
             cost = game_do_command(
-                map_tile.x,
-                parameter_1 | 0x69,
-                map_tile.y,
-                parameter_2,
-                GAME_COMMAND_PLACE_SCENERY,
-                parameter_3,
+                map_tile.x, parameter_1 | 0x69, map_tile.y, parameter_2, GAME_COMMAND_PLACE_SCENERY, parameter_3,
                 gSceneryPlaceZ);
 
             if (cost == MONEY32_UNDEFINED)
@@ -2471,11 +2408,7 @@ static money32 try_place_ghost_scenery(
                 (parameter_1 & 0xFF00)
                     | (GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_5
                        | GAME_COMMAND_FLAG_GHOST | GAME_COMMAND_FLAG_PATH_SCENERY),
-                map_tile.y,
-                parameter_2,
-                GAME_COMMAND_PLACE_PATH,
-                parameter_3,
-                0);
+                map_tile.y, parameter_2, GAME_COMMAND_PLACE_PATH, parameter_3, 0);
 
             if (cost == MONEY32_UNDEFINED)
                 return cost;
@@ -2493,12 +2426,7 @@ static money32 try_place_ghost_scenery(
             // Walls
             // 6e26b0
             cost = game_do_command(
-                map_tile.x,
-                parameter_1 | 0x69,
-                map_tile.y,
-                parameter_2,
-                GAME_COMMAND_PLACE_WALL,
-                gSceneryPlaceZ,
+                map_tile.x, parameter_1 | 0x69, map_tile.y, parameter_2, GAME_COMMAND_PLACE_WALL, gSceneryPlaceZ,
                 _secondaryColour | (_tertiaryColour << 8));
 
             if (cost == MONEY32_UNDEFINED)
@@ -2517,12 +2445,7 @@ static money32 try_place_ghost_scenery(
             // Large Scenery
             // 6e25a7
             cost = game_do_command(
-                map_tile.x,
-                parameter_1 | 0x69,
-                map_tile.y,
-                parameter_2,
-                GAME_COMMAND_PLACE_LARGE_SCENERY,
-                parameter_3,
+                map_tile.x, parameter_1 | 0x69, map_tile.y, parameter_2, GAME_COMMAND_PLACE_LARGE_SCENERY, parameter_3,
                 gSceneryPlaceZ);
 
             if (cost == MONEY32_UNDEFINED)
@@ -2862,13 +2785,9 @@ static void window_top_toolbar_tool_down(rct_window* w, rct_widgetindex widgetIn
             gGameCommandErrorTitle = STR_UNABLE_TO_REMOVE_ALL_SCENERY_FROM_HERE;
 
             game_do_command(
-                gMapSelectPositionA.x,
-                1,
-                gMapSelectPositionA.y,
+                gMapSelectPositionA.x, 1, gMapSelectPositionA.y,
                 ((gClearSmallScenery ? 1 : 0) | (gClearLargeScenery ? 1 : 0) << 1 | (gClearFootpath ? 1 : 0) << 2),
-                GAME_COMMAND_CLEAR_SCENERY,
-                gMapSelectPositionB.x,
-                gMapSelectPositionB.y);
+                GAME_COMMAND_CLEAR_SCENERY, gMapSelectPositionB.x, gMapSelectPositionB.y);
             gCurrentToolId = TOOL_CROSSHAIR;
             break;
         case WIDX_LAND:
@@ -2876,13 +2795,8 @@ static void window_top_toolbar_tool_down(rct_window* w, rct_widgetindex widgetIn
             {
                 gGameCommandErrorTitle = STR_CANT_CHANGE_LAND_TYPE;
                 game_do_command(
-                    gMapSelectPositionA.x,
-                    1,
-                    gMapSelectPositionA.y,
-                    gLandToolTerrainSurface | (gLandToolTerrainEdge << 8),
-                    GAME_COMMAND_CHANGE_SURFACE_STYLE,
-                    gMapSelectPositionB.x,
-                    gMapSelectPositionB.y);
+                    gMapSelectPositionA.x, 1, gMapSelectPositionA.y, gLandToolTerrainSurface | (gLandToolTerrainEdge << 8),
+                    GAME_COMMAND_CHANGE_SURFACE_STYLE, gMapSelectPositionB.x, gMapSelectPositionB.y);
                 gCurrentToolId = TOOL_UP_DOWN_ARROW;
             }
             break;
@@ -3023,12 +2937,7 @@ static void window_top_toolbar_water_tool_drag(int16_t x, int16_t y)
         gGameCommandErrorTitle = STR_CANT_RAISE_WATER_LEVEL_HERE;
 
         game_do_command(
-            gMapSelectPositionA.x,
-            1,
-            gMapSelectPositionA.y,
-            dx,
-            GAME_COMMAND_RAISE_WATER,
-            gMapSelectPositionB.x,
+            gMapSelectPositionA.x, 1, gMapSelectPositionA.y, dx, GAME_COMMAND_RAISE_WATER, gMapSelectPositionB.x,
             gMapSelectPositionB.y);
         gWaterToolRaiseCost = MONEY32_UNDEFINED;
         gWaterToolLowerCost = MONEY32_UNDEFINED;
@@ -3045,12 +2954,7 @@ static void window_top_toolbar_water_tool_drag(int16_t x, int16_t y)
         gGameCommandErrorTitle = STR_CANT_LOWER_WATER_LEVEL_HERE;
 
         game_do_command(
-            gMapSelectPositionA.x,
-            1,
-            gMapSelectPositionA.y,
-            dx,
-            GAME_COMMAND_LOWER_WATER,
-            gMapSelectPositionB.x,
+            gMapSelectPositionA.x, 1, gMapSelectPositionA.y, dx, GAME_COMMAND_LOWER_WATER, gMapSelectPositionB.x,
             gMapSelectPositionB.y);
         gWaterToolRaiseCost = MONEY32_UNDEFINED;
         gWaterToolLowerCost = MONEY32_UNDEFINED;
@@ -3077,13 +2981,9 @@ static void window_top_toolbar_tool_drag(rct_window* w, rct_widgetindex widgetIn
             gGameCommandErrorTitle = STR_UNABLE_TO_REMOVE_ALL_SCENERY_FROM_HERE;
 
             game_do_command(
-                gMapSelectPositionA.x,
-                1,
-                gMapSelectPositionA.y,
+                gMapSelectPositionA.x, 1, gMapSelectPositionA.y,
                 ((gClearSmallScenery ? 1 : 0) | (gClearLargeScenery ? 1 : 0) << 1 | (gClearFootpath ? 1 : 0) << 2),
-                GAME_COMMAND_CLEAR_SCENERY,
-                gMapSelectPositionB.x,
-                gMapSelectPositionB.y);
+                GAME_COMMAND_CLEAR_SCENERY, gMapSelectPositionB.x, gMapSelectPositionB.y);
             gCurrentToolId = TOOL_CROSSHAIR;
             break;
         case WIDX_LAND:
@@ -3094,13 +2994,8 @@ static void window_top_toolbar_tool_drag(rct_window* w, rct_widgetindex widgetIn
                 {
                     gGameCommandErrorTitle = STR_CANT_CHANGE_LAND_TYPE;
                     game_do_command(
-                        gMapSelectPositionA.x,
-                        1,
-                        gMapSelectPositionA.y,
-                        gLandToolTerrainSurface | (gLandToolTerrainEdge << 8),
-                        GAME_COMMAND_CHANGE_SURFACE_STYLE,
-                        gMapSelectPositionB.x,
-                        gMapSelectPositionB.y);
+                        gMapSelectPositionA.x, 1, gMapSelectPositionA.y, gLandToolTerrainSurface | (gLandToolTerrainEdge << 8),
+                        GAME_COMMAND_CHANGE_SURFACE_STYLE, gMapSelectPositionB.x, gMapSelectPositionB.y);
                     // The tool is set to 12 here instead of 3 so that the dragging cursor is not the elevation change cursor
                     gCurrentToolId = TOOL_CROSSHAIR;
                 }
@@ -3271,12 +3166,8 @@ static void top_toolbar_init_debug_menu(rct_window* w, rct_widget* widget)
     gDropdownItemsArgs[DDIDX_DEBUG_PAINT] = STR_DEBUG_DROPDOWN_DEBUG_PAINT;
 
     window_dropdown_show_text(
-        w->x + widget->left,
-        w->y + widget->top,
-        widget->bottom - widget->top + 1,
-        w->colours[0] | 0x80,
-        DROPDOWN_FLAG_STAY_OPEN,
-        TOP_TOOLBAR_DEBUG_COUNT);
+        w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[0] | 0x80,
+        DROPDOWN_FLAG_STAY_OPEN, TOP_TOOLBAR_DEBUG_COUNT);
 
     // Disable items that are not yet available in multiplayer
     if (network_get_mode() != NETWORK_MODE_NONE)
@@ -3391,11 +3282,7 @@ static void top_toolbar_init_view_menu(rct_window* w, rct_widget* widget)
     gDropdownItemsArgs[DDIDX_HIGHLIGHT_PATH_ISSUES] = STR_HIGHLIGHT_PATH_ISSUES_MENU;
 
     window_dropdown_show_text(
-        w->x + widget->left,
-        w->y + widget->top,
-        widget->bottom - widget->top + 1,
-        w->colours[1] | 0x80,
-        0,
+        w->x + widget->left, w->y + widget->top, widget->bottom - widget->top + 1, w->colours[1] | 0x80, 0,
         TOP_TOOLBAR_VIEW_MENU_COUNT);
 
     // Set checkmarks
diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp
index bcd700bfcd..ca7f7db797 100644
--- a/src/openrct2-ui/windows/TrackDesignManage.cpp
+++ b/src/openrct2-ui/windows/TrackDesignManage.cpp
@@ -183,11 +183,7 @@ static void window_track_manage_mouseup(rct_window* w, rct_widgetindex widgetInd
             break;
         case WIDX_RENAME:
             window_text_input_raw_open(
-                w,
-                widgetIndex,
-                STR_TRACK_DESIGN_RENAME_TITLE,
-                STR_TRACK_DESIGN_RENAME_DESC,
-                _trackDesignFileReference->name,
+                w, widgetIndex, STR_TRACK_DESIGN_RENAME_TITLE, STR_TRACK_DESIGN_RENAME_DESC, _trackDesignFileReference->name,
                 127);
             break;
         case WIDX_DELETE:
@@ -252,13 +248,8 @@ static void window_track_delete_prompt_open()
     int32_t screenWidth = context_get_width();
     int32_t screenHeight = context_get_height();
     rct_window* w = window_create(
-        std::max(TOP_TOOLBAR_HEIGHT + 1, (screenWidth - 250) / 2),
-        (screenHeight - 44) / 2,
-        250,
-        74,
-        &window_track_delete_prompt_events,
-        WC_TRACK_DELETE_PROMPT,
-        WF_STICK_TO_FRONT);
+        std::max(TOP_TOOLBAR_HEIGHT + 1, (screenWidth - 250) / 2), (screenHeight - 44) / 2, 250, 74,
+        &window_track_delete_prompt_events, WC_TRACK_DELETE_PROMPT, WF_STICK_TO_FRONT);
     w->widgets = window_track_delete_prompt_widgets;
     w->enabled_widgets = (1 << WIDX_CLOSE) | (1 << WIDX_RENAME) | (1 << WIDX_DELETE);
     window_init_scroll_widgets(w);
@@ -301,13 +292,8 @@ static void window_track_delete_prompt_paint(rct_window* w, rct_drawpixelinfo* d
     window_draw_widgets(w, dpi);
 
     gfx_draw_string_centred_wrapped(
-        dpi,
-        &_trackDesignFileReference->name,
-        w->x + 125,
-        w->y + 28,
-        246,
-        STR_ARE_YOU_SURE_YOU_WANT_TO_PERMANENTLY_DELETE_TRACK,
-        COLOUR_BLACK);
+        dpi, &_trackDesignFileReference->name, w->x + 125, w->y + 28, 246,
+        STR_ARE_YOU_SURE_YOU_WANT_TO_PERMANENTLY_DELETE_TRACK, COLOUR_BLACK);
 }
 
 static void window_track_design_list_reload_tracks()
diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp
index 0758232d35..4d75d0a04f 100644
--- a/src/openrct2-ui/windows/TrackDesignPlace.cpp
+++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp
@@ -401,13 +401,8 @@ static void window_track_place_clear_provisional()
     if (_window_track_place_last_was_valid)
     {
         place_virtual_track(
-            _trackDesign,
-            PTD_OPERATION_CLEAR_OUTLINES,
-            true,
-            _window_track_place_ride_index,
-            _window_track_place_last_valid_x,
-            _window_track_place_last_valid_y,
-            _window_track_place_last_valid_z);
+            _trackDesign, PTD_OPERATION_CLEAR_OUTLINES, true, _window_track_place_ride_index, _window_track_place_last_valid_x,
+            _window_track_place_last_valid_y, _window_track_place_last_valid_z);
         _window_track_place_last_was_valid = false;
     }
 }
diff --git a/src/openrct2-ui/windows/ViewClipping.cpp b/src/openrct2-ui/windows/ViewClipping.cpp
index 87f9345591..ce02a23c89 100644
--- a/src/openrct2-ui/windows/ViewClipping.cpp
+++ b/src/openrct2-ui/windows/ViewClipping.cpp
@@ -427,11 +427,7 @@ static void window_view_clipping_paint(rct_window* w, rct_drawpixelinfo* dpi)
                 // Height label is Units.
                 clipHeightValueInUnits = (fixed16_1dp)(FIXED_1DP(gClipHeight, 0) / 2 - FIXED_1DP(7, 0));
                 gfx_draw_string_left(
-                    dpi,
-                    STR_UNIT1DP_NO_SUFFIX,
-                    &clipHeightValueInUnits,
-                    w->colours[0],
-                    x,
+                    dpi, STR_UNIT1DP_NO_SUFFIX, &clipHeightValueInUnits, w->colours[0], x,
                     y); // Printing the value in Height Units.
             }
             else
diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp
index 7f4227a449..7014050bbf 100644
--- a/src/openrct2-ui/windows/Viewport.cpp
+++ b/src/openrct2-ui/windows/Viewport.cpp
@@ -150,13 +150,7 @@ static void window_viewport_mouseup(rct_window* w, rct_widgetindex widgetIndex)
             if (mainWindow != nullptr)
             {
                 get_map_coordinates_from_pos(
-                    w->x + (w->width / 2),
-                    w->y + (w->height / 2),
-                    VIEWPORT_INTERACTION_MASK_NONE,
-                    &x,
-                    &y,
-                    nullptr,
-                    nullptr,
+                    w->x + (w->width / 2), w->y + (w->height / 2), VIEWPORT_INTERACTION_MASK_NONE, &x, &y, nullptr, nullptr,
                     nullptr);
                 window_scroll_to_location(mainWindow, x, y, tile_element_height(x, y));
             }
diff --git a/src/openrct2-ui/windows/Window.h b/src/openrct2-ui/windows/Window.h
index 37b4d56343..2faa5e10b9 100644
--- a/src/openrct2-ui/windows/Window.h
+++ b/src/openrct2-ui/windows/Window.h
@@ -128,20 +128,11 @@ void window_network_status_close();
 
 void window_text_input_key(rct_window* w, char keychar);
 void window_text_input_open(
-    rct_window* call_w,
-    rct_widgetindex call_widget,
-    rct_string_id title,
-    rct_string_id description,
-    rct_string_id existing_text,
-    uintptr_t existing_args,
-    int32_t maxLength);
+    rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description,
+    rct_string_id existing_text, uintptr_t existing_args, int32_t maxLength);
 void window_text_input_raw_open(
-    rct_window* call_w,
-    rct_widgetindex call_widget,
-    rct_string_id title,
-    rct_string_id description,
-    const_utf8string existing_text,
-    int32_t maxLength);
+    rct_window* call_w, rct_widgetindex call_widget, rct_string_id title, rct_string_id description,
+    const_utf8string existing_text, int32_t maxLength);
 
 rct_window* window_object_load_error_open(utf8* path, size_t numMissingObjects, const rct_object_entry* missingObjects);
 
diff --git a/src/openrct2/Cheats.cpp b/src/openrct2/Cheats.cpp
index 265e511f4f..abd9a0c7e8 100644
--- a/src/openrct2/Cheats.cpp
+++ b/src/openrct2/Cheats.cpp
@@ -499,12 +499,7 @@ static void cheat_own_all_land()
 #pragma endregion
 
 void game_command_cheat(
-    [[maybe_unused]] int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
+    [[maybe_unused]] int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     int32_t cheat = *ecx;
diff --git a/src/openrct2/CmdlineSprite.cpp b/src/openrct2/CmdlineSprite.cpp
index a8fa858e04..1a1d89e725 100644
--- a/src/openrct2/CmdlineSprite.cpp
+++ b/src/openrct2/CmdlineSprite.cpp
@@ -239,27 +239,14 @@ static bool sprite_file_export(int32_t spriteIndex, const char* outPath)
     if (spriteHeader->flags & G1_FLAG_RLE_COMPRESSION)
     {
         gfx_rle_sprite_to_buffer(
-            spriteHeader->offset,
-            pixels,
-            (uint8_t*)spriteFilePalette,
-            &dpi,
-            IMAGE_TYPE_DEFAULT,
-            0,
-            spriteHeader->height,
-            0,
+            spriteHeader->offset, pixels, (uint8_t*)spriteFilePalette, &dpi, IMAGE_TYPE_DEFAULT, 0, spriteHeader->height, 0,
             spriteHeader->width);
     }
     else
     {
         gfx_bmp_sprite_to_buffer(
-            (uint8_t*)spriteFilePalette,
-            spriteHeader->offset,
-            pixels,
-            spriteHeader,
-            &dpi,
-            spriteHeader->height,
-            spriteHeader->width,
-            IMAGE_TYPE_DEFAULT);
+            (uint8_t*)spriteFilePalette, spriteHeader->offset, pixels, spriteHeader, &dpi, spriteHeader->height,
+            spriteHeader->width, IMAGE_TYPE_DEFAULT);
     }
 
     auto const pixels8 = dpi.bits;
@@ -284,15 +271,8 @@ static bool sprite_file_export(int32_t spriteIndex, const char* outPath)
 }
 
 static bool sprite_file_import(
-    const char* path,
-    int16_t x_offset,
-    int16_t y_offset,
-    bool keep_palette,
-    bool forceBmp,
-    rct_g1_element* outElement,
-    uint8_t** outBuffer,
-    int* outBufferLength,
-    int32_t mode)
+    const char* path, int16_t x_offset, int16_t y_offset, bool keep_palette, bool forceBmp, rct_g1_element* outElement,
+    uint8_t** outBuffer, int* outBufferLength, int32_t mode)
 {
     try
     {
@@ -589,10 +569,7 @@ int32_t cmdline_for_sprite(const char** argv, int32_t argc)
         if (sprite_list == nullptr)
         {
             fprintf(
-                stderr,
-                "Error parsing sprite description file: %s at line %d column %d\n",
-                error.text,
-                error.line,
+                stderr, "Error parsing sprite description file: %s at line %d column %d\n", error.text, error.line,
                 error.column);
             return -1;
         }
@@ -663,15 +640,9 @@ int32_t cmdline_for_sprite(const char** argv, int32_t argc)
             int bufferLength;
 
             if (!sprite_file_import(
-                    imagePath,
-                    x_offset == nullptr ? 0 : json_integer_value(x_offset),
-                    y_offset == nullptr ? 0 : json_integer_value(y_offset),
-                    keep_palette,
-                    forceBmp,
-                    &spriteElement,
-                    &buffer,
-                    &bufferLength,
-                    gSpriteMode))
+                    imagePath, x_offset == nullptr ? 0 : json_integer_value(x_offset),
+                    y_offset == nullptr ? 0 : json_integer_value(y_offset), keep_palette, forceBmp, &spriteElement, &buffer,
+                    &bufferLength, gSpriteMode))
             {
                 fprintf(stderr, "Could not import image file: %s\nCanceling\n", imagePath);
                 json_decref(sprite_list);
diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp
index 4aa54704e1..ae79b136e5 100644
--- a/src/openrct2/Context.cpp
+++ b/src/openrct2/Context.cpp
@@ -124,8 +124,7 @@ namespace OpenRCT2
 
     public:
         Context(
-            const std::shared_ptr<IPlatformEnvironment>& env,
-            const std::shared_ptr<IAudioContext>& audioContext,
+            const std::shared_ptr<IPlatformEnvironment>& env, const std::shared_ptr<IAudioContext>& audioContext,
             const std::shared_ptr<IUiContext>& uiContext)
             : _env(env)
             , _audioContext(audioContext)
@@ -794,9 +793,7 @@ namespace OpenRCT2
                     auto ctx = reinterpret_cast<Context*>(vctx);
                     ctx->RunFrame();
                 },
-                this,
-                0,
-                1);
+                this, 0, 1);
 #endif // __EMSCRIPTEN__
             log_verbose("finish openrct2 loop");
         }
@@ -1000,8 +997,7 @@ namespace OpenRCT2
     }
 
     std::unique_ptr<IContext> CreateContext(
-        const std::shared_ptr<IPlatformEnvironment>& env,
-        const std::shared_ptr<Audio::IAudioContext>& audioContext,
+        const std::shared_ptr<IPlatformEnvironment>& env, const std::shared_ptr<Audio::IAudioContext>& audioContext,
         const std::shared_ptr<IUiContext>& uiContext)
     {
         return std::make_unique<Context>(env, audioContext, uiContext);
diff --git a/src/openrct2/Context.h b/src/openrct2/Context.h
index c688d3e837..f365f55097 100644
--- a/src/openrct2/Context.h
+++ b/src/openrct2/Context.h
@@ -125,8 +125,7 @@ namespace OpenRCT2
 
     std::unique_ptr<IContext> CreateContext();
     std::unique_ptr<IContext> CreateContext(
-        const std::shared_ptr<IPlatformEnvironment>& env,
-        const std::shared_ptr<Audio::IAudioContext>& audioContext,
+        const std::shared_ptr<IPlatformEnvironment>& env, const std::shared_ptr<Audio::IAudioContext>& audioContext,
         const std::shared_ptr<Ui::IUiContext>& uiContext);
     IContext* GetContext();
 } // namespace OpenRCT2
diff --git a/src/openrct2/Diagnostic.cpp b/src/openrct2/Diagnostic.cpp
index e9d59346e4..6962888cfe 100644
--- a/src/openrct2/Diagnostic.cpp
+++ b/src/openrct2/Diagnostic.cpp
@@ -35,9 +35,8 @@ static FILE* diagnostic_get_stream(DIAGNOSTIC_LEVEL level)
 
 #ifdef __ANDROID__
 
-int _android_log_priority[DIAGNOSTIC_LEVEL_COUNT] = {
-    ANDROID_LOG_FATAL, ANDROID_LOG_ERROR, ANDROID_LOG_WARN, ANDROID_LOG_VERBOSE, ANDROID_LOG_INFO
-};
+int _android_log_priority[DIAGNOSTIC_LEVEL_COUNT] = { ANDROID_LOG_FATAL, ANDROID_LOG_ERROR, ANDROID_LOG_WARN,
+                                                      ANDROID_LOG_VERBOSE, ANDROID_LOG_INFO };
 
 void diagnostic_log(DIAGNOSTIC_LEVEL diagnosticLevel, const char* format, ...)
 {
diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp
index ac8ae3ab22..3babaf05f8 100644
--- a/src/openrct2/Editor.cpp
+++ b/src/openrct2/Editor.cpp
@@ -533,13 +533,8 @@ namespace Editor
     }
 
     void GameCommandEditScenarioOptions(
-        [[maybe_unused]] int32_t* eax,
-        int32_t* ebx,
-        int32_t* ecx,
-        int32_t* edx,
-        [[maybe_unused]] int32_t* esi,
-        [[maybe_unused]] int32_t* edi,
-        [[maybe_unused]] int32_t* ebp)
+        [[maybe_unused]] int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi,
+        [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
     {
         if (!(*ebx & GAME_COMMAND_FLAG_APPLY))
         {
diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp
index 1b14d18d27..1356e75b5b 100644
--- a/src/openrct2/Game.cpp
+++ b/src/openrct2/Game.cpp
@@ -839,13 +839,8 @@ bool game_is_not_paused()
  *  rct2: 0x00667C15
  */
 void game_pause_toggle(
-    [[maybe_unused]] int32_t* eax,
-    int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    [[maybe_unused]] int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
+    [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     if (*ebx & GAME_COMMAND_FLAG_APPLY)
         pause_toggle();
@@ -858,13 +853,8 @@ void game_pause_toggle(
  *  rct2: 0x0066DB5F
  */
 static void game_load_or_quit(
-    [[maybe_unused]] int32_t* eax,
-    int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, int32_t* ebx, [[maybe_unused]] int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi,
+    int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     if (*ebx & GAME_COMMAND_FLAG_APPLY)
     {
@@ -1323,16 +1313,8 @@ void game_autosave()
 
     utf8 timeName[44];
     snprintf(
-        timeName,
-        sizeof(timeName),
-        "autosave_%04u-%02u-%02u_%02u-%02u-%02u%s",
-        currentDate.year,
-        currentDate.month,
-        currentDate.day,
-        currentTime.hour,
-        currentTime.minute,
-        currentTime.second,
-        fileExtension);
+        timeName, sizeof(timeName), "autosave_%04u-%02u-%02u_%02u-%02u-%02u%s", currentDate.year, currentDate.month,
+        currentDate.day, currentTime.hour, currentTime.minute, currentTime.second, fileExtension);
 
     limit_autosave_count(NUMBER_OF_AUTOSAVES_TO_KEEP, (gScreenFlags & SCREEN_FLAGS_EDITOR));
 
diff --git a/src/openrct2/Intro.cpp b/src/openrct2/Intro.cpp
index d55fe8fef7..61e26ce769 100644
--- a/src/openrct2/Intro.cpp
+++ b/src/openrct2/Intro.cpp
@@ -178,12 +178,8 @@ void intro_draw(rct_drawpixelinfo* dpi)
 
             // Draw a white rectangle for the logo background (gives a bit of white margin)
             gfx_fill_rect(
-                dpi,
-                (screenWidth / 2) - 320 + 50,
-                _introStateCounter + 50,
-                (screenWidth / 2) - 320 + 50 + 540,
-                _introStateCounter + 50 + 425,
-                BORDER_COLOUR_PUBLISHER);
+                dpi, (screenWidth / 2) - 320 + 50, _introStateCounter + 50, (screenWidth / 2) - 320 + 50 + 540,
+                _introStateCounter + 50 + 425, BORDER_COLOUR_PUBLISHER);
 
             // Draw Infogrames logo
             gfx_draw_sprite(dpi, SPR_INTRO_INFOGRAMES_00, (screenWidth / 2) - 320 + 69, _introStateCounter + 69, 0);
diff --git a/src/openrct2/actions/GameActionCompat.cpp b/src/openrct2/actions/GameActionCompat.cpp
index b648d6df6d..f8fae8895c 100644
--- a/src/openrct2/actions/GameActionCompat.cpp
+++ b/src/openrct2/actions/GameActionCompat.cpp
@@ -40,13 +40,8 @@ money32 place_park_entrance(int16_t x, int16_t y, int16_t z, uint8_t direction)
  *  rct2: 0x006666E7
  */
 void game_command_place_park_entrance(
-    [[maybe_unused]] int32_t* eax,
-    [[maybe_unused]] int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    [[maybe_unused]] int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
+    [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     Guard::Assert(false, "GAME_COMMAND_PLACE_PARK_ENTRANCE DEPRECATED");
 }
@@ -83,13 +78,8 @@ void park_set_entrance_fee(money32 fee)
 }
 
 void game_command_set_park_entrance_fee(
-    [[maybe_unused]] int* eax,
-    [[maybe_unused]] int* ebx,
-    [[maybe_unused]] int* ecx,
-    [[maybe_unused]] int* edx,
-    [[maybe_unused]] int* esi,
-    int* edi,
-    [[maybe_unused]] int* ebp)
+    [[maybe_unused]] int* eax, [[maybe_unused]] int* ebx, [[maybe_unused]] int* ecx, [[maybe_unused]] int* edx,
+    [[maybe_unused]] int* esi, int* edi, [[maybe_unused]] int* ebp)
 {
     money16 fee = (money16)(*edi & 0xFFFF);
     auto gameAction = SetParkEntranceFeeAction(fee);
@@ -143,13 +133,8 @@ money32 ride_create_command(int32_t type, int32_t subType, int32_t flags, uint8_
  *  rct2: 0x006B3F0F
  */
 void game_command_create_ride(
-    [[maybe_unused]] int32_t* eax,
-    [[maybe_unused]] int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    [[maybe_unused]] int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
+    [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     Guard::Assert(false, "GAME_COMMAND_CREATE_RIDE DEPRECATED");
 }
@@ -169,13 +154,8 @@ void ride_set_status(int32_t rideIndex, int32_t status)
  *  rct2: 0x006B4EA6
  */
 void game_command_set_ride_status(
-    [[maybe_unused]] int32_t* eax,
-    [[maybe_unused]] int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    [[maybe_unused]] int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
+    [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     Guard::Assert(false, "GAME_COMMAND_SET_RIDE_STATUS DEPRECATED");
 }
@@ -194,13 +174,8 @@ void ride_set_name(int32_t rideIndex, const char* name)
  *  rct2: 0x006B578B
  */
 void game_command_set_ride_name(
-    [[maybe_unused]] int32_t* eax,
-    [[maybe_unused]] int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    [[maybe_unused]] int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
+    [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     Guard::Assert(false, "GAME_COMMAND_SET_RIDE_NAME DEPRECATED");
 }
@@ -220,13 +195,8 @@ void ride_action_modify(int32_t rideIndex, int32_t modifyType, int32_t flags)
  *  rct2: 0x006B49D9
  */
 void game_command_demolish_ride(
-    [[maybe_unused]] int32_t* eax,
-    [[maybe_unused]] int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    [[maybe_unused]] int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
+    [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     Guard::Assert(false, "GAME_COMMAND_DEMOLISH_RIDE DEPRECATED");
 }
@@ -245,13 +215,8 @@ void guest_set_name(uint16_t spriteIndex, const char* name)
  *  rct2: 0x00698D6C
  */
 void game_command_set_guest_name(
-    [[maybe_unused]] int32_t* eax,
-    [[maybe_unused]] int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    [[maybe_unused]] int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
+    [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     Guard::Assert(false, "GAME_COMMAND_SET_GUEST_NAME DEPRECATED");
 }
@@ -267,13 +232,8 @@ void staff_set_name(uint16_t spriteIndex, const char* name)
 }
 
 void game_command_set_staff_name(
-    [[maybe_unused]] int32_t* eax,
-    [[maybe_unused]] int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    [[maybe_unused]] int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
+    [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     Guard::Assert(false, "GAME_COMMAND_SET_STAFF_NAME DEPRECATED");
 }
@@ -297,13 +257,7 @@ bool place_peep_spawn(CoordsXYZD location)
 
 #pragma region MazeSetTrack
 money32 maze_set_track(
-    uint16_t x,
-    uint16_t y,
-    uint16_t z,
-    uint8_t flags,
-    bool initialPlacement,
-    uint8_t direction,
-    uint8_t rideIndex,
+    uint16_t x, uint16_t y, uint16_t z, uint8_t flags, bool initialPlacement, uint8_t direction, uint8_t rideIndex,
     uint8_t mode)
 {
     auto gameAction = MazeSetTrackAction(x, y, z, initialPlacement, direction, rideIndex, mode);
@@ -334,13 +288,8 @@ money32 maze_set_track(
  *  rct2: 0x006CD8CE
  */
 void game_command_set_maze_track(
-    [[maybe_unused]] int32_t* eax,
-    [[maybe_unused]] int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    [[maybe_unused]] int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, [[maybe_unused]] int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx,
+    [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     Guard::Assert(false, "GAME_COMMAND_SET_MAZE_TRACK DEPRECATED");
 }
diff --git a/src/openrct2/actions/RideDemolishAction.hpp b/src/openrct2/actions/RideDemolishAction.hpp
index 9cf27d0f65..16c1394482 100644
--- a/src/openrct2/actions/RideDemolishAction.hpp
+++ b/src/openrct2/actions/RideDemolishAction.hpp
@@ -67,8 +67,7 @@ public:
         if (ride->lifecycle_flags & RIDE_LIFECYCLE_INDESTRUCTIBLE && _modifyType == RIDE_MODIFY_DEMOLISH)
         {
             return std::make_unique<GameActionResult>(
-                GA_ERROR::NO_CLEARANCE,
-                STR_CANT_DEMOLISH_RIDE,
+                GA_ERROR::NO_CLEARANCE, STR_CANT_DEMOLISH_RIDE,
                 STR_LOCAL_AUTHORITY_FORBIDS_DEMOLITION_OR_MODIFICATIONS_TO_THIS_RIDE);
         }
 
@@ -305,13 +304,8 @@ private:
             if (type != TRACK_ELEM_INVERTED_90_DEG_UP_TO_FLAT_QUARTER_LOOP)
             {
                 money32 removePrice = game_do_command(
-                    x,
-                    GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_APPLY | (rotation << 8),
-                    y,
-                    type | (tile_element_get_track_sequence(it.element) << 8),
-                    GAME_COMMAND_REMOVE_TRACK,
-                    z,
-                    0);
+                    x, GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_APPLY | (rotation << 8), y,
+                    type | (tile_element_get_track_sequence(it.element) << 8), GAME_COMMAND_REMOVE_TRACK, z, 0);
 
                 if (removePrice == MONEY32_UNDEFINED)
                     tile_element_remove(it.element);
diff --git a/src/openrct2/cmdline/BenchGfxCommmands.cpp b/src/openrct2/cmdline/BenchGfxCommmands.cpp
index fd3ed96788..806d0eaaf4 100644
--- a/src/openrct2/cmdline/BenchGfxCommmands.cpp
+++ b/src/openrct2/cmdline/BenchGfxCommmands.cpp
@@ -14,8 +14,7 @@ static exitcode_t HandleBenchGfx(CommandLineArgEnumerator* argEnumerator);
 
 const CommandLineCommand CommandLine::BenchGfxCommands[]{
     // Main commands
-    DefineCommand("", "<file> [iterations count]", nullptr, HandleBenchGfx),
-    CommandTableEnd
+    DefineCommand("", "<file> [iterations count]", nullptr, HandleBenchGfx), CommandTableEnd
 };
 
 static exitcode_t HandleBenchGfx(CommandLineArgEnumerator* argEnumerator)
diff --git a/src/openrct2/core/FileIndex.hpp b/src/openrct2/core/FileIndex.hpp
index 7ce9ccf5ff..761f90af42 100644
--- a/src/openrct2/core/FileIndex.hpp
+++ b/src/openrct2/core/FileIndex.hpp
@@ -80,11 +80,7 @@ public:
      * @param paths A list of search directories.
      */
     FileIndex(
-        std::string name,
-        uint32_t magicNumber,
-        uint8_t version,
-        std::string indexPath,
-        std::string pattern,
+        std::string name, uint32_t magicNumber, uint8_t version, std::string indexPath, std::string pattern,
         std::vector<std::string> paths)
         : _name(name)
         , _magicNumber(magicNumber)
@@ -174,13 +170,8 @@ private:
     }
 
     void BuildRange(
-        int32_t language,
-        const ScanResult& scanResult,
-        size_t rangeStart,
-        size_t rangeEnd,
-        std::vector<TItem>& items,
-        std::atomic<size_t>& processed,
-        std::mutex& printLock) const
+        int32_t language, const ScanResult& scanResult, size_t rangeStart, size_t rangeEnd, std::vector<TItem>& items,
+        std::atomic<size_t>& processed, std::mutex& printLock) const
     {
         items.reserve(rangeEnd - rangeStart);
         for (size_t i = rangeStart; i < rangeEnd; i++)
@@ -237,15 +228,8 @@ private:
                 auto& items = containers.emplace_back();
 
                 jobPool.AddTask(std::bind(
-                    &FileIndex<TItem>::BuildRange,
-                    this,
-                    language,
-                    std::cref(scanResult),
-                    rangeStart,
-                    rangeStart + stepSize,
-                    std::ref(items),
-                    std::ref(processed),
-                    std::ref(printLock)));
+                    &FileIndex<TItem>::BuildRange, this, language, std::cref(scanResult), rangeStart, rangeStart + stepSize,
+                    std::ref(items), std::ref(processed), std::ref(printLock)));
 
                 reportProgress();
             }
diff --git a/src/openrct2/core/Imaging.cpp b/src/openrct2/core/Imaging.cpp
index 322e9a44aa..e48537977d 100644
--- a/src/openrct2/core/Imaging.cpp
+++ b/src/openrct2/core/Imaging.cpp
@@ -219,14 +219,7 @@ namespace Imaging
                 colourType = PNG_COLOR_TYPE_PALETTE;
             }
             png_set_IHDR(
-                png_ptr,
-                info_ptr,
-                image.Width,
-                image.Height,
-                8,
-                colourType,
-                PNG_INTERLACE_NONE,
-                PNG_COMPRESSION_TYPE_DEFAULT,
+                png_ptr, info_ptr, image.Width, image.Height, 8, colourType, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
                 PNG_FILTER_TYPE_DEFAULT);
             png_write_info(png_ptr, info_ptr);
 
diff --git a/src/openrct2/core/String.cpp b/src/openrct2/core/String.cpp
index 1c0e903f2b..9f7d1c32ab 100644
--- a/src/openrct2/core/String.cpp
+++ b/src/openrct2/core/String.cpp
@@ -709,30 +709,16 @@ namespace String
 
         // Measure how long the destination needs to be
         auto requiredSize = LCMapStringEx(
-            LOCALE_NAME_USER_DEFAULT,
-            LCMAP_UPPERCASE | LCMAP_LINGUISTIC_CASING,
-            srcW.c_str(),
-            (int)srcW.length(),
-            nullptr,
-            0,
-            nullptr,
-            nullptr,
-            0);
+            LOCALE_NAME_USER_DEFAULT, LCMAP_UPPERCASE | LCMAP_LINGUISTIC_CASING, srcW.c_str(), (int)srcW.length(), nullptr, 0,
+            nullptr, nullptr, 0);
 
         auto dstW = std::wstring();
         dstW.resize(requiredSize);
 
         // Transform the string
         auto result = LCMapStringEx(
-            LOCALE_NAME_USER_DEFAULT,
-            LCMAP_UPPERCASE | LCMAP_LINGUISTIC_CASING,
-            srcW.c_str(),
-            (int)srcW.length(),
-            dstW.data(),
-            (int)dstW.length(),
-            nullptr,
-            nullptr,
-            0);
+            LOCALE_NAME_USER_DEFAULT, LCMAP_UPPERCASE | LCMAP_LINGUISTIC_CASING, srcW.c_str(), (int)srcW.length(), dstW.data(),
+            (int)dstW.length(), nullptr, nullptr, 0);
         if (result == 0)
         {
             // Check the error
diff --git a/src/openrct2/drawing/AVX2Drawing.cpp b/src/openrct2/drawing/AVX2Drawing.cpp
index c5153341ac..8988e83c66 100644
--- a/src/openrct2/drawing/AVX2Drawing.cpp
+++ b/src/openrct2/drawing/AVX2Drawing.cpp
@@ -16,14 +16,8 @@
 #include <immintrin.h>
 
 void mask_avx2(
-    int32_t width,
-    int32_t height,
-    const uint8_t* RESTRICT maskSrc,
-    const uint8_t* RESTRICT colourSrc,
-    uint8_t* RESTRICT dst,
-    int32_t maskWrap,
-    int32_t colourWrap,
-    int32_t dstWrap)
+    int32_t width, int32_t height, const uint8_t* RESTRICT maskSrc, const uint8_t* RESTRICT colourSrc, uint8_t* RESTRICT dst,
+    int32_t maskWrap, int32_t colourWrap, int32_t dstWrap)
 {
     if (width == 32)
     {
@@ -55,14 +49,8 @@ void mask_avx2(
 #endif
 
 void mask_avx2(
-    int32_t width,
-    int32_t height,
-    const uint8_t* RESTRICT maskSrc,
-    const uint8_t* RESTRICT colourSrc,
-    uint8_t* RESTRICT dst,
-    int32_t maskWrap,
-    int32_t colourWrap,
-    int32_t dstWrap)
+    int32_t width, int32_t height, const uint8_t* RESTRICT maskSrc, const uint8_t* RESTRICT colourSrc, uint8_t* RESTRICT dst,
+    int32_t maskWrap, int32_t colourWrap, int32_t dstWrap)
 {
     openrct2_assert(false, "AVX2 function called on a CPU that doesn't support AVX2");
 }
diff --git a/src/openrct2/drawing/Drawing.Sprite.cpp b/src/openrct2/drawing/Drawing.Sprite.cpp
index 79c5043b89..e4009b63be 100644
--- a/src/openrct2/drawing/Drawing.Sprite.cpp
+++ b/src/openrct2/drawing/Drawing.Sprite.cpp
@@ -169,14 +169,8 @@ static void read_and_convert_gxdat(IStream* stream, size_t count, bool is_rctc,
 }
 
 void mask_scalar(
-    int32_t width,
-    int32_t height,
-    const uint8_t* RESTRICT maskSrc,
-    const uint8_t* RESTRICT colourSrc,
-    uint8_t* RESTRICT dst,
-    int32_t maskWrap,
-    int32_t colourWrap,
-    int32_t dstWrap)
+    int32_t width, int32_t height, const uint8_t* RESTRICT maskSrc, const uint8_t* RESTRICT colourSrc, uint8_t* RESTRICT dst,
+    int32_t maskWrap, int32_t colourWrap, int32_t dstWrap)
 {
     for (int32_t yy = 0; yy < height; yy++)
     {
@@ -408,14 +402,8 @@ bool gfx_load_csg()
  *  rct2: 0x0067A690
  */
 void FASTCALL gfx_bmp_sprite_to_buffer(
-    const uint8_t* palette_pointer,
-    uint8_t* source_pointer,
-    uint8_t* dest_pointer,
-    const rct_g1_element* source_image,
-    rct_drawpixelinfo* dest_dpi,
-    int32_t height,
-    int32_t width,
-    int32_t image_type)
+    const uint8_t* palette_pointer, uint8_t* source_pointer, uint8_t* dest_pointer, const rct_g1_element* source_image,
+    rct_drawpixelinfo* dest_dpi, int32_t height, int32_t width, int32_t image_type)
 {
     uint16_t zoom_level = dest_dpi->zoom_level;
     uint8_t zoom_amount = 1 << zoom_level;
diff --git a/src/openrct2/drawing/Drawing.String.cpp b/src/openrct2/drawing/Drawing.String.cpp
index 18be747ddb..a75a77fe88 100644
--- a/src/openrct2/drawing/Drawing.String.cpp
+++ b/src/openrct2/drawing/Drawing.String.cpp
@@ -418,13 +418,7 @@ int32_t string_get_height_raw(char* buffer)
  * ticks    : ebp >> 16
  */
 void gfx_draw_string_centred_wrapped_partial(
-    rct_drawpixelinfo* dpi,
-    int32_t x,
-    int32_t y,
-    int32_t width,
-    int32_t colour,
-    rct_string_id format,
-    void* args,
+    rct_drawpixelinfo* dpi, int32_t x, int32_t y, int32_t width, int32_t colour, rct_string_id format, void* args,
     int32_t ticks)
 {
     int32_t numLines, fontSpriteBase, lineHeight, lineY;
@@ -972,12 +966,7 @@ static int32_t ttf_get_string_width(const utf8* text)
  *  rct2: 0x00682F28
  */
 void gfx_draw_string_with_y_offsets(
-    rct_drawpixelinfo* dpi,
-    const utf8* text,
-    int32_t colour,
-    int32_t x,
-    int32_t y,
-    const int8_t* yOffsets,
+    rct_drawpixelinfo* dpi, const utf8* text, int32_t colour, int32_t x, int32_t y, const int8_t* yOffsets,
     bool forceSpriteFont)
 {
     text_draw_info info;
diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp
index 6d6919947b..4d529a633f 100644
--- a/src/openrct2/drawing/Drawing.cpp
+++ b/src/openrct2/drawing/Drawing.cpp
@@ -466,14 +466,8 @@ const translucent_window_palette TranslucentWindowPalettes[COLOUR_COUNT] = {
 // clang-format on
 
 void (*mask_fn)(
-    int32_t width,
-    int32_t height,
-    const uint8_t* RESTRICT maskSrc,
-    const uint8_t* RESTRICT colourSrc,
-    uint8_t* RESTRICT dst,
-    int32_t maskWrap,
-    int32_t colourWrap,
-    int32_t dstWrap)
+    int32_t width, int32_t height, const uint8_t* RESTRICT maskSrc, const uint8_t* RESTRICT colourSrc, uint8_t* RESTRICT dst,
+    int32_t maskWrap, int32_t colourWrap, int32_t dstWrap)
     = nullptr;
 
 void mask_init()
diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h
index e56710d128..f7aec4e88a 100644
--- a/src/openrct2/drawing/Drawing.h
+++ b/src/openrct2/drawing/Drawing.h
@@ -304,23 +304,11 @@ uint32_t gfx_object_allocate_images(const rct_g1_element* images, uint32_t count
 void gfx_object_free_images(uint32_t baseImageId, uint32_t count);
 void gfx_object_check_all_images_freed();
 void FASTCALL gfx_bmp_sprite_to_buffer(
-    const uint8_t* palette_pointer,
-    uint8_t* source_pointer,
-    uint8_t* dest_pointer,
-    const rct_g1_element* source_image,
-    rct_drawpixelinfo* dest_dpi,
-    int32_t height,
-    int32_t width,
-    int32_t image_type);
+    const uint8_t* palette_pointer, uint8_t* source_pointer, uint8_t* dest_pointer, const rct_g1_element* source_image,
+    rct_drawpixelinfo* dest_dpi, int32_t height, int32_t width, int32_t image_type);
 void FASTCALL gfx_rle_sprite_to_buffer(
-    const uint8_t* RESTRICT source_bits_pointer,
-    uint8_t* RESTRICT dest_bits_pointer,
-    const uint8_t* RESTRICT palette_pointer,
-    const rct_drawpixelinfo* RESTRICT dpi,
-    int32_t image_type,
-    int32_t source_y_start,
-    int32_t height,
-    int32_t source_x_start,
+    const uint8_t* RESTRICT source_bits_pointer, uint8_t* RESTRICT dest_bits_pointer, const uint8_t* RESTRICT palette_pointer,
+    const rct_drawpixelinfo* RESTRICT dpi, int32_t image_type, int32_t source_y_start, int32_t height, int32_t source_x_start,
     int32_t width);
 void FASTCALL gfx_draw_sprite(rct_drawpixelinfo* dpi, int32_t image_id, int32_t x, int32_t y, uint32_t tertiary_colour);
 void FASTCALL gfx_draw_glpyh(rct_drawpixelinfo* dpi, int32_t image_id, int32_t x, int32_t y, uint8_t* palette);
@@ -364,21 +352,10 @@ void gfx_draw_string_left_centred(
     rct_drawpixelinfo* dpi, rct_string_id format, void* args, int32_t colour, int32_t x, int32_t y);
 void draw_string_centred_raw(rct_drawpixelinfo* dpi, int32_t x, int32_t y, int32_t numLines, char* text);
 void gfx_draw_string_centred_wrapped_partial(
-    rct_drawpixelinfo* dpi,
-    int32_t x,
-    int32_t y,
-    int32_t width,
-    int32_t colour,
-    rct_string_id format,
-    void* args,
+    rct_drawpixelinfo* dpi, int32_t x, int32_t y, int32_t width, int32_t colour, rct_string_id format, void* args,
     int32_t ticks);
 void gfx_draw_string_with_y_offsets(
-    rct_drawpixelinfo* dpi,
-    const utf8* text,
-    int32_t colour,
-    int32_t x,
-    int32_t y,
-    const int8_t* yOffsets,
+    rct_drawpixelinfo* dpi, const utf8* text, int32_t colour, int32_t x, int32_t y, const int8_t* yOffsets,
     bool forceSpriteFont);
 
 int32_t gfx_wrap_string(char* buffer, int32_t width, int32_t* num_lines, int32_t* font_height);
@@ -397,43 +374,19 @@ rct_size16 FASTCALL gfx_get_sprite_size(uint32_t image_id);
 size_t g1_calculate_data_size(const rct_g1_element* g1);
 
 void mask_scalar(
-    int32_t width,
-    int32_t height,
-    const uint8_t* RESTRICT maskSrc,
-    const uint8_t* RESTRICT colourSrc,
-    uint8_t* RESTRICT dst,
-    int32_t maskWrap,
-    int32_t colourWrap,
-    int32_t dstWrap);
+    int32_t width, int32_t height, const uint8_t* RESTRICT maskSrc, const uint8_t* RESTRICT colourSrc, uint8_t* RESTRICT dst,
+    int32_t maskWrap, int32_t colourWrap, int32_t dstWrap);
 void mask_sse4_1(
-    int32_t width,
-    int32_t height,
-    const uint8_t* RESTRICT maskSrc,
-    const uint8_t* RESTRICT colourSrc,
-    uint8_t* RESTRICT dst,
-    int32_t maskWrap,
-    int32_t colourWrap,
-    int32_t dstWrap);
+    int32_t width, int32_t height, const uint8_t* RESTRICT maskSrc, const uint8_t* RESTRICT colourSrc, uint8_t* RESTRICT dst,
+    int32_t maskWrap, int32_t colourWrap, int32_t dstWrap);
 void mask_avx2(
-    int32_t width,
-    int32_t height,
-    const uint8_t* RESTRICT maskSrc,
-    const uint8_t* RESTRICT colourSrc,
-    uint8_t* RESTRICT dst,
-    int32_t maskWrap,
-    int32_t colourWrap,
-    int32_t dstWrap);
+    int32_t width, int32_t height, const uint8_t* RESTRICT maskSrc, const uint8_t* RESTRICT colourSrc, uint8_t* RESTRICT dst,
+    int32_t maskWrap, int32_t colourWrap, int32_t dstWrap);
 void mask_init();
 
 extern void (*mask_fn)(
-    int32_t width,
-    int32_t height,
-    const uint8_t* RESTRICT maskSrc,
-    const uint8_t* RESTRICT colourSrc,
-    uint8_t* RESTRICT dst,
-    int32_t maskWrap,
-    int32_t colourWrap,
-    int32_t dstWrap);
+    int32_t width, int32_t height, const uint8_t* RESTRICT maskSrc, const uint8_t* RESTRICT colourSrc, uint8_t* RESTRICT dst,
+    int32_t maskWrap, int32_t colourWrap, int32_t dstWrap);
 
 #include "NewDrawing.h"
 
diff --git a/src/openrct2/drawing/DrawingFast.cpp b/src/openrct2/drawing/DrawingFast.cpp
index ebfc1813f7..9641402893 100644
--- a/src/openrct2/drawing/DrawingFast.cpp
+++ b/src/openrct2/drawing/DrawingFast.cpp
@@ -15,14 +15,8 @@
 
 template<int32_t image_type, int32_t zoom_level>
 static void FASTCALL DrawRLESprite2(
-    const uint8_t* RESTRICT source_bits_pointer,
-    uint8_t* RESTRICT dest_bits_pointer,
-    const uint8_t* RESTRICT palette_pointer,
-    const rct_drawpixelinfo* RESTRICT dpi,
-    int32_t source_y_start,
-    int32_t height,
-    int32_t source_x_start,
-    int32_t width)
+    const uint8_t* RESTRICT source_bits_pointer, uint8_t* RESTRICT dest_bits_pointer, const uint8_t* RESTRICT palette_pointer,
+    const rct_drawpixelinfo* RESTRICT dpi, int32_t source_y_start, int32_t height, int32_t source_x_start, int32_t width)
 {
     // The distance between two samples in the source image.
     // We draw the image at 1 / (2^zoom_level) scale.
@@ -149,14 +143,8 @@ static void FASTCALL DrawRLESprite2(
 
 template<int32_t image_type>
 static void FASTCALL DrawRLESprite1(
-    const uint8_t* source_bits_pointer,
-    uint8_t* dest_bits_pointer,
-    const uint8_t* palette_pointer,
-    const rct_drawpixelinfo* dpi,
-    int32_t source_y_start,
-    int32_t height,
-    int32_t source_x_start,
-    int32_t width)
+    const uint8_t* source_bits_pointer, uint8_t* dest_bits_pointer, const uint8_t* palette_pointer,
+    const rct_drawpixelinfo* dpi, int32_t source_y_start, int32_t height, int32_t source_x_start, int32_t width)
 {
     int32_t zoom_level = dpi->zoom_level;
     switch (zoom_level)
@@ -189,14 +177,8 @@ static void FASTCALL DrawRLESprite1(
  *  rct2: 0x0067AA18
  */
 void FASTCALL gfx_rle_sprite_to_buffer(
-    const uint8_t* RESTRICT source_bits_pointer,
-    uint8_t* RESTRICT dest_bits_pointer,
-    const uint8_t* RESTRICT palette_pointer,
-    const rct_drawpixelinfo* RESTRICT dpi,
-    int32_t image_type,
-    int32_t source_y_start,
-    int32_t height,
-    int32_t source_x_start,
+    const uint8_t* RESTRICT source_bits_pointer, uint8_t* RESTRICT dest_bits_pointer, const uint8_t* RESTRICT palette_pointer,
+    const rct_drawpixelinfo* RESTRICT dpi, int32_t image_type, int32_t source_y_start, int32_t height, int32_t source_x_start,
     int32_t width)
 {
     if (image_type & IMAGE_TYPE_REMAP)
diff --git a/src/openrct2/drawing/ImageImporter.h b/src/openrct2/drawing/ImageImporter.h
index cd2cee78ad..d1faccceda 100644
--- a/src/openrct2/drawing/ImageImporter.h
+++ b/src/openrct2/drawing/ImageImporter.h
@@ -45,10 +45,7 @@ namespace OpenRCT2::Drawing
         };
 
         ImportResult Import(
-            const Image& image,
-            int32_t offsetX = 0,
-            int32_t offsetY = 0,
-            IMPORT_FLAGS flags = IMPORT_FLAGS::NONE,
+            const Image& image, int32_t offsetX = 0, int32_t offsetY = 0, IMPORT_FLAGS flags = IMPORT_FLAGS::NONE,
             IMPORT_MODE mode = IMPORT_MODE::DEFAULT) const;
 
     private:
diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp
index 17b73fb19b..0c72e757b8 100644
--- a/src/openrct2/drawing/LightFX.cpp
+++ b/src/openrct2/drawing/LightFX.cpp
@@ -791,32 +791,16 @@ void lightfx_add_lights_magic_vehicles()
             {
                 case RIDE_TYPE_OBSERVATION_TOWER:
                     lightfx_add_3d_light(
-                        vehicleID,
-                        0x0000 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                        vehicle->x,
-                        vehicle->y + 16,
-                        vehicle->z,
+                        vehicleID, 0x0000 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, vehicle->x, vehicle->y + 16, vehicle->z,
                         LIGHTFX_LIGHT_TYPE_SPOT_3);
                     lightfx_add_3d_light(
-                        vehicleID,
-                        0x0100 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                        vehicle->x + 16,
-                        vehicle->y,
-                        vehicle->z,
+                        vehicleID, 0x0100 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, vehicle->x + 16, vehicle->y, vehicle->z,
                         LIGHTFX_LIGHT_TYPE_SPOT_3);
                     lightfx_add_3d_light(
-                        vehicleID,
-                        0x0200 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                        vehicle->x - 16,
-                        vehicle->y,
-                        vehicle->z,
+                        vehicleID, 0x0200 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, vehicle->x - 16, vehicle->y, vehicle->z,
                         LIGHTFX_LIGHT_TYPE_SPOT_3);
                     lightfx_add_3d_light(
-                        vehicleID,
-                        0x0300 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                        vehicle->x,
-                        vehicle->y - 16,
-                        vehicle->z,
+                        vehicleID, 0x0300 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, vehicle->x, vehicle->y - 16, vehicle->z,
                         LIGHTFX_LIGHT_TYPE_SPOT_3);
                     break;
                 case RIDE_TYPE_MINE_TRAIN_COASTER:
@@ -826,21 +810,13 @@ void lightfx_add_lights_magic_vehicles()
                         place_x -= offsetLookup[(vehicle->sprite_direction + 0) % 32] * 2;
                         place_y -= offsetLookup[(vehicle->sprite_direction + 8) % 32] * 2;
                         lightfx_add_3d_light(
-                            vehicleID,
-                            0x0000 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                            place_x,
-                            place_y,
-                            place_z,
+                            vehicleID, 0x0000 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, place_x, place_y, place_z,
                             LIGHTFX_LIGHT_TYPE_SPOT_3);
                     }
                     break;
                 case RIDE_TYPE_CHAIRLIFT:
                     lightfx_add_3d_light(
-                        vehicleID,
-                        0x0000 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                        place_x,
-                        place_y,
-                        place_z - 16,
+                        vehicleID, 0x0000 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, place_x, place_y, place_z - 16,
                         LIGHTFX_LIGHT_TYPE_LANTERN_2);
                     break;
                 case RIDE_TYPE_BOAT_HIRE:
@@ -864,50 +840,30 @@ void lightfx_add_lights_magic_vehicles()
                     place_x -= offsetLookup[(vehicle_draw->sprite_direction + 0) % 32];
                     place_y -= offsetLookup[(vehicle_draw->sprite_direction + 8) % 32];
                     lightfx_add_3d_light(
-                        vehicleID,
-                        0x0000 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                        place_x,
-                        place_y,
-                        place_z,
+                        vehicleID, 0x0000 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, place_x, place_y, place_z,
                         LIGHTFX_LIGHT_TYPE_SPOT_2);
                     place_x -= offsetLookup[(vehicle_draw->sprite_direction + 0) % 32];
                     place_y -= offsetLookup[(vehicle_draw->sprite_direction + 8) % 32];
                     lightfx_add_3d_light(
-                        vehicleID,
-                        0x0100 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                        place_x,
-                        place_y,
-                        place_z,
+                        vehicleID, 0x0100 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, place_x, place_y, place_z,
                         LIGHTFX_LIGHT_TYPE_SPOT_2);
                     break;
                 }
                 case RIDE_TYPE_MONORAIL:
                     lightfx_add_3d_light(
-                        vehicleID,
-                        0x0000 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                        vehicle->x,
-                        vehicle->y,
-                        vehicle->z + 12,
+                        vehicleID, 0x0000 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, vehicle->x, vehicle->y, vehicle->z + 12,
                         LIGHTFX_LIGHT_TYPE_SPOT_2);
                     if (vehicle == vehicle_get_head(vehicle))
                     {
                         place_x -= offsetLookup[(vehicle->sprite_direction + 0) % 32] * 2;
                         place_y -= offsetLookup[(vehicle->sprite_direction + 8) % 32] * 2;
                         lightfx_add_3d_light(
-                            vehicleID,
-                            0x0100 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                            place_x,
-                            place_y,
-                            place_z + 10,
+                            vehicleID, 0x0100 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, place_x, place_y, place_z + 10,
                             LIGHTFX_LIGHT_TYPE_LANTERN_3);
                         place_x -= offsetLookup[(vehicle->sprite_direction + 0) % 32] * 3;
                         place_y -= offsetLookup[(vehicle->sprite_direction + 8) % 32] * 3;
                         lightfx_add_3d_light(
-                            vehicleID,
-                            0x0200 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                            place_x,
-                            place_y,
-                            place_z + 2,
+                            vehicleID, 0x0200 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, place_x, place_y, place_z + 2,
                             LIGHTFX_LIGHT_TYPE_LANTERN_3);
                     }
                     if (vehicle == vehicle_get_tail(vehicle))
@@ -915,20 +871,12 @@ void lightfx_add_lights_magic_vehicles()
                         place_x += offsetLookup[(vehicle->sprite_direction + 0) % 32] * 2;
                         place_y += offsetLookup[(vehicle->sprite_direction + 8) % 32] * 2;
                         lightfx_add_3d_light(
-                            vehicleID,
-                            0x0300 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                            place_x,
-                            place_y,
-                            place_z + 10,
+                            vehicleID, 0x0300 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, place_x, place_y, place_z + 10,
                             LIGHTFX_LIGHT_TYPE_LANTERN_3);
                         place_x += offsetLookup[(vehicle->sprite_direction + 0) % 32] * 2;
                         place_y += offsetLookup[(vehicle->sprite_direction + 8) % 32] * 2;
                         lightfx_add_3d_light(
-                            vehicleID,
-                            0x0400 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                            place_x,
-                            place_y,
-                            place_z + 2,
+                            vehicleID, 0x0400 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, place_x, place_y, place_z + 2,
                             LIGHTFX_LIGHT_TYPE_LANTERN_3);
                     }
                     break;
@@ -938,30 +886,18 @@ void lightfx_add_lights_magic_vehicles()
                         place_x -= offsetLookup[(vehicle->sprite_direction + 0) % 32] * 2;
                         place_y -= offsetLookup[(vehicle->sprite_direction + 8) % 32] * 2;
                         lightfx_add_3d_light(
-                            vehicleID,
-                            0x0100 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                            place_x,
-                            place_y,
-                            place_z + 10,
+                            vehicleID, 0x0100 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, place_x, place_y, place_z + 10,
                             LIGHTFX_LIGHT_TYPE_LANTERN_3);
                         place_x -= offsetLookup[(vehicle->sprite_direction + 0) % 32] * 2;
                         place_y -= offsetLookup[(vehicle->sprite_direction + 8) % 32] * 2;
                         lightfx_add_3d_light(
-                            vehicleID,
-                            0x0200 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                            place_x,
-                            place_y,
-                            place_z + 2,
+                            vehicleID, 0x0200 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, place_x, place_y, place_z + 2,
                             LIGHTFX_LIGHT_TYPE_LANTERN_3);
                     }
                     else
                     {
                         lightfx_add_3d_light(
-                            vehicleID,
-                            0x0000 | LIGHTFX_LIGHT_QUALIFIER_SPRITE,
-                            place_x,
-                            place_y,
-                            place_z + 10,
+                            vehicleID, 0x0000 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, place_x, place_y, place_z + 10,
                             LIGHTFX_LIGHT_TYPE_LANTERN_3);
                     }
                     break;
@@ -1143,12 +1079,7 @@ static uint8_t mix_light(uint32_t a, uint32_t b, uint32_t intensity)
 }
 
 void lightfx_render_to_texture(
-    void* dstPixels,
-    uint32_t dstPitch,
-    uint8_t* bits,
-    uint32_t width,
-    uint32_t height,
-    const uint32_t* palette,
+    void* dstPixels, uint32_t dstPitch, uint8_t* bits, uint32_t width, uint32_t height, const uint32_t* palette,
     const uint32_t* lightPalette)
 {
     lightfx_update_viewport_settings();
diff --git a/src/openrct2/drawing/LightFX.h b/src/openrct2/drawing/LightFX.h
index 2fb5b25829..5d0cc98aa2 100644
--- a/src/openrct2/drawing/LightFX.h
+++ b/src/openrct2/drawing/LightFX.h
@@ -68,12 +68,7 @@ uint32_t lightfx_get_light_polution();
 
 void lightfx_apply_palette_filter(uint8_t i, uint8_t* r, uint8_t* g, uint8_t* b);
 void lightfx_render_to_texture(
-    void* dstPixels,
-    uint32_t dstPitch,
-    uint8_t* bits,
-    uint32_t width,
-    uint32_t height,
-    const uint32_t* palette,
+    void* dstPixels, uint32_t dstPitch, uint8_t* bits, uint32_t width, uint32_t height, const uint32_t* palette,
     const uint32_t* lightPalette);
 
 #endif // __ENABLE_LIGHTFX__
diff --git a/src/openrct2/drawing/SSE41Drawing.cpp b/src/openrct2/drawing/SSE41Drawing.cpp
index 69c2c34954..281a3a5e13 100644
--- a/src/openrct2/drawing/SSE41Drawing.cpp
+++ b/src/openrct2/drawing/SSE41Drawing.cpp
@@ -16,14 +16,8 @@
 #include <immintrin.h>
 
 void mask_sse4_1(
-    int32_t width,
-    int32_t height,
-    const uint8_t* RESTRICT maskSrc,
-    const uint8_t* RESTRICT colourSrc,
-    uint8_t* RESTRICT dst,
-    int32_t maskWrap,
-    int32_t colourWrap,
-    int32_t dstWrap)
+    int32_t width, int32_t height, const uint8_t* RESTRICT maskSrc, const uint8_t* RESTRICT colourSrc, uint8_t* RESTRICT dst,
+    int32_t maskWrap, int32_t colourWrap, int32_t dstWrap)
 {
     if (width == 32)
     {
@@ -69,14 +63,8 @@ void mask_sse4_1(
 #endif
 
 void mask_sse4_1(
-    int32_t width,
-    int32_t height,
-    const uint8_t* RESTRICT maskSrc,
-    const uint8_t* RESTRICT colourSrc,
-    uint8_t* RESTRICT dst,
-    int32_t maskWrap,
-    int32_t colourWrap,
-    int32_t dstWrap)
+    int32_t width, int32_t height, const uint8_t* RESTRICT maskSrc, const uint8_t* RESTRICT colourSrc, uint8_t* RESTRICT dst,
+    int32_t maskWrap, int32_t colourWrap, int32_t dstWrap)
 {
     openrct2_assert(false, "SSE 4.1 function called on a CPU that doesn't support SSE 4.1");
 }
diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp
index 655a5fceac..e89cb29878 100644
--- a/src/openrct2/drawing/Text.cpp
+++ b/src/openrct2/drawing/Text.cpp
@@ -113,13 +113,7 @@ static void DrawText(rct_drawpixelinfo* dpi, int32_t x, int32_t y, TextPaint* pa
 }
 
 static void DrawTextCompat(
-    rct_drawpixelinfo* dpi,
-    int32_t x,
-    int32_t y,
-    rct_string_id format,
-    void* args,
-    uint8_t colour,
-    TextAlignment alignment,
+    rct_drawpixelinfo* dpi, int32_t x, int32_t y, rct_string_id format, void* args, uint8_t colour, TextAlignment alignment,
     bool underline = false)
 {
     _legacyPaint.UnderlineText = underline;
@@ -131,15 +125,8 @@ static void DrawTextCompat(
 }
 
 static void DrawTextEllipsisedCompat(
-    rct_drawpixelinfo* dpi,
-    int32_t x,
-    int32_t y,
-    int32_t width,
-    rct_string_id format,
-    void* args,
-    uint8_t colour,
-    TextAlignment alignment,
-    bool underline = false)
+    rct_drawpixelinfo* dpi, int32_t x, int32_t y, int32_t width, rct_string_id format, void* args, uint8_t colour,
+    TextAlignment alignment, bool underline = false)
 {
     _legacyPaint.UnderlineText = underline;
     _legacyPaint.Colour = colour;
diff --git a/src/openrct2/interface/Chat.cpp b/src/openrct2/interface/Chat.cpp
index 6e91da75b7..d9c582b187 100644
--- a/src/openrct2/interface/Chat.cpp
+++ b/src/openrct2/interface/Chat.cpp
@@ -130,20 +130,10 @@ void chat_draw(rct_drawpixelinfo* dpi, uint8_t chatBackgroundColor)
         gfx_fill_rect_inset(
             dpi, _chatLeft, _chatTop - 5, _chatRight, _chatBottom + 5, chatBackgroundColor, INSET_RECT_FLAG_FILL_NONE);
         gfx_fill_rect_inset(
-            dpi,
-            _chatLeft + 1,
-            _chatTop - 4,
-            _chatRight - 1,
-            _chatBottom - inputLineHeight - 6,
-            chatBackgroundColor,
+            dpi, _chatLeft + 1, _chatTop - 4, _chatRight - 1, _chatBottom - inputLineHeight - 6, chatBackgroundColor,
             INSET_RECT_FLAG_BORDER_INSET);
         gfx_fill_rect_inset(
-            dpi,
-            _chatLeft + 1,
-            _chatBottom - inputLineHeight - 5,
-            _chatRight - 1,
-            _chatBottom + 4,
-            chatBackgroundColor,
+            dpi, _chatLeft + 1, _chatBottom - inputLineHeight - 5, _chatRight - 1, _chatBottom + 4, chatBackgroundColor,
             INSET_RECT_FLAG_BORDER_INSET); // Textbox
     }
 
diff --git a/src/openrct2/interface/Fonts.cpp b/src/openrct2/interface/Fonts.cpp
index 693cf77c75..49b4d2a20a 100644
--- a/src/openrct2/interface/Fonts.cpp
+++ b/src/openrct2/interface/Fonts.cpp
@@ -109,30 +109,12 @@ static bool LoadFont(LocalisationService& localisationService, TTFFontSetDescrip
 static bool LoadCustomConfigFont(LocalisationService& localisationService)
 {
     static TTFFontSetDescriptor TTFFontCustom = { {
-        { gConfigFonts.file_name,
-          gConfigFonts.font_name,
-          gConfigFonts.size_tiny,
-          gConfigFonts.x_offset,
-          gConfigFonts.y_offset,
-          gConfigFonts.height_tiny,
-          gConfigFonts.hinting_threshold,
-          nullptr },
-        { gConfigFonts.file_name,
-          gConfigFonts.font_name,
-          gConfigFonts.size_small,
-          gConfigFonts.x_offset,
-          gConfigFonts.y_offset,
-          gConfigFonts.height_small,
-          gConfigFonts.hinting_threshold,
-          nullptr },
-        { gConfigFonts.file_name,
-          gConfigFonts.font_name,
-          gConfigFonts.size_medium,
-          gConfigFonts.x_offset,
-          gConfigFonts.y_offset,
-          gConfigFonts.height_medium,
-          gConfigFonts.hinting_threshold,
-          nullptr },
+        { gConfigFonts.file_name, gConfigFonts.font_name, gConfigFonts.size_tiny, gConfigFonts.x_offset, gConfigFonts.y_offset,
+          gConfigFonts.height_tiny, gConfigFonts.hinting_threshold, nullptr },
+        { gConfigFonts.file_name, gConfigFonts.font_name, gConfigFonts.size_small, gConfigFonts.x_offset, gConfigFonts.y_offset,
+          gConfigFonts.height_small, gConfigFonts.hinting_threshold, nullptr },
+        { gConfigFonts.file_name, gConfigFonts.font_name, gConfigFonts.size_medium, gConfigFonts.x_offset,
+          gConfigFonts.y_offset, gConfigFonts.height_medium, gConfigFonts.hinting_threshold, nullptr },
     } };
 
     ttf_dispose();
diff --git a/src/openrct2/interface/InteractiveConsole.cpp b/src/openrct2/interface/InteractiveConsole.cpp
index c094f6fd8f..265d326e04 100644
--- a/src/openrct2/interface/InteractiveConsole.cpp
+++ b/src/openrct2/interface/InteractiveConsole.cpp
@@ -127,12 +127,8 @@ static int32_t cc_rides(InteractiveConsole& console, const utf8** argv, int32_t
                 char name[128];
                 format_string(name, 128, ride->name, &ride->name_arguments);
                 console.WriteFormatLine(
-                    "ride: %03d type: %02u subtype %03u operating mode: %02u name: %s",
-                    i,
-                    ride->type,
-                    ride->subtype,
-                    ride->mode,
-                    name);
+                    "ride: %03d type: %02u subtype %03u operating mode: %02u name: %s", i, ride->type, ride->subtype,
+                    ride->mode, name);
             }
         }
         else if (strcmp(argv[0], "set") == 0)
@@ -592,14 +588,8 @@ static int32_t cc_get(InteractiveConsole& console, const utf8** argv, int32_t ar
                 LocationXY16 mapCoord = {};
                 rct_viewport* viewport = window_get_viewport(w);
                 get_map_coordinates_from_pos(
-                    viewport->view_width / 2,
-                    viewport->view_height / 2,
-                    VIEWPORT_INTERACTION_MASK_TERRAIN,
-                    &mapCoord.x,
-                    &mapCoord.y,
-                    &interactionType,
-                    &tileElement,
-                    nullptr);
+                    viewport->view_width / 2, viewport->view_height / 2, VIEWPORT_INTERACTION_MASK_TERRAIN, &mapCoord.x,
+                    &mapCoord.y, &interactionType, &tileElement, nullptr);
                 mapCoord.x -= 16;
                 mapCoord.x /= 32;
                 mapCoord.y -= 16;
diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp
index 5583b4bc5d..b79f886734 100644
--- a/src/openrct2/interface/Screenshot.cpp
+++ b/src/openrct2/interface/Screenshot.cpp
@@ -140,16 +140,8 @@ static int32_t screenshot_get_next_path(char* path, size_t size)
     }
     const size_t leftBytes = size - strlen(path);
     snprintf(
-        fileNameCh,
-        leftBytes,
-        "%s %d-%02d-%02d %02d-%02d-%02d.png",
-        park_name,
-        currentDate.year,
-        currentDate.month,
-        currentDate.day,
-        currentTime.hour,
-        currentTime.minute,
-        currentTime.second);
+        fileNameCh, leftBytes, "%s %d-%02d-%02d %02d-%02d-%02d.png", park_name, currentDate.year, currentDate.month,
+        currentDate.day, currentTime.hour, currentTime.minute, currentTime.second);
 
     if (!platform_file_exists(path))
     {
@@ -167,17 +159,8 @@ static int32_t screenshot_get_next_path(char* path, size_t size)
     {
         // Glue together path and filename
         snprintf(
-            fileNameCh,
-            leftBytes,
-            "%s %d-%02d-%02d %02d-%02d-%02d (%d).png",
-            park_name,
-            currentDate.year,
-            currentDate.month,
-            currentDate.day,
-            currentTime.hour,
-            currentTime.minute,
-            currentTime.second,
-            i);
+            fileNameCh, leftBytes, "%s %d-%02d-%02d %02d-%02d-%02d (%d).png", park_name, currentDate.year, currentDate.month,
+            currentDate.day, currentTime.hour, currentTime.minute, currentTime.second, i);
 
         if (!platform_file_exists(path))
         {
diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp
index 4738ad0743..61de2571aa 100644
--- a/src/openrct2/interface/Viewport.cpp
+++ b/src/openrct2/interface/Viewport.cpp
@@ -146,17 +146,8 @@ void centre_2d_coordinates(int32_t x, int32_t y, int32_t z, int32_t* out_x, int3
  *  w:      esi
  */
 void viewport_create(
-    rct_window* w,
-    int32_t x,
-    int32_t y,
-    int32_t width,
-    int32_t height,
-    int32_t zoom,
-    int32_t centre_x,
-    int32_t centre_y,
-    int32_t centre_z,
-    char flags,
-    int16_t sprite)
+    rct_window* w, int32_t x, int32_t y, int32_t width, int32_t height, int32_t zoom, int32_t centre_x, int32_t centre_y,
+    int32_t centre_z, char flags, int16_t sprite)
 {
     rct_viewport* viewport = nullptr;
     for (int32_t i = 0; i < MAX_VIEWPORT_COUNT; i++)
@@ -1614,29 +1605,16 @@ void sub_68862C(rct_drawpixelinfo* dpi, paint_struct* ps)
  * viewport: edi
  */
 void get_map_coordinates_from_pos(
-    int32_t screenX,
-    int32_t screenY,
-    int32_t flags,
-    int16_t* x,
-    int16_t* y,
-    int32_t* interactionType,
-    rct_tile_element** tileElement,
-    rct_viewport** viewport)
+    int32_t screenX, int32_t screenY, int32_t flags, int16_t* x, int16_t* y, int32_t* interactionType,
+    rct_tile_element** tileElement, rct_viewport** viewport)
 {
     rct_window* window = window_find_from_point(screenX, screenY);
     get_map_coordinates_from_pos_window(window, screenX, screenY, flags, x, y, interactionType, tileElement, viewport);
 }
 
 void get_map_coordinates_from_pos_window(
-    rct_window* window,
-    int32_t screenX,
-    int32_t screenY,
-    int32_t flags,
-    int16_t* x,
-    int16_t* y,
-    int32_t* interactionType,
-    rct_tile_element** tileElement,
-    rct_viewport** viewport)
+    rct_window* window, int32_t screenX, int32_t screenY, int32_t flags, int16_t* x, int16_t* y, int32_t* interactionType,
+    rct_tile_element** tileElement, rct_viewport** viewport)
 {
     _unk9AC154 = flags & 0xFFFF;
     _interactionSpriteType = 0;
diff --git a/src/openrct2/interface/Viewport.h b/src/openrct2/interface/Viewport.h
index f53784c23f..8e03f71d64 100644
--- a/src/openrct2/interface/Viewport.h
+++ b/src/openrct2/interface/Viewport.h
@@ -120,17 +120,8 @@ extern uint32_t gCurrentViewportFlags;
 void viewport_init_all();
 void centre_2d_coordinates(int32_t x, int32_t y, int32_t z, int32_t* out_x, int32_t* out_y, rct_viewport* viewport);
 void viewport_create(
-    rct_window* w,
-    int32_t x,
-    int32_t y,
-    int32_t width,
-    int32_t height,
-    int32_t zoom,
-    int32_t centre_x,
-    int32_t centre_y,
-    int32_t centre_z,
-    char flags,
-    int16_t sprite);
+    rct_window* w, int32_t x, int32_t y, int32_t width, int32_t height, int32_t zoom, int32_t centre_x, int32_t centre_y,
+    int32_t centre_z, char flags, int16_t sprite);
 void viewport_update_position(rct_window* window);
 void viewport_update_sprite_follow(rct_window* window);
 void viewport_update_smart_sprite_follow(rct_window* window);
@@ -155,24 +146,11 @@ void hide_construction_rights();
 void viewport_set_visibility(uint8_t mode);
 
 void get_map_coordinates_from_pos(
-    int32_t screenX,
-    int32_t screenY,
-    int32_t flags,
-    int16_t* x,
-    int16_t* y,
-    int32_t* interactionType,
-    rct_tile_element** tileElement,
-    rct_viewport** viewport);
+    int32_t screenX, int32_t screenY, int32_t flags, int16_t* x, int16_t* y, int32_t* interactionType,
+    rct_tile_element** tileElement, rct_viewport** viewport);
 void get_map_coordinates_from_pos_window(
-    rct_window* window,
-    int32_t screenX,
-    int32_t screenY,
-    int32_t flags,
-    int16_t* x,
-    int16_t* y,
-    int32_t* interactionType,
-    rct_tile_element** tileElement,
-    rct_viewport** viewport);
+    rct_window* window, int32_t screenX, int32_t screenY, int32_t flags, int16_t* x, int16_t* y, int32_t* interactionType,
+    rct_tile_element** tileElement, rct_viewport** viewport);
 
 int32_t viewport_interaction_get_item_left(int32_t x, int32_t y, viewport_interaction_info* info);
 int32_t viewport_interaction_left_over(int32_t x, int32_t y);
diff --git a/src/openrct2/interface/Widget.h b/src/openrct2/interface/Widget.h
index 8e7868f4fd..bd3140e685 100644
--- a/src/openrct2/interface/Widget.h
+++ b/src/openrct2/interface/Widget.h
@@ -67,13 +67,7 @@ bool widget_is_pressed(rct_window* w, rct_widgetindex widgetIndex);
 bool widget_is_highlighted(rct_window* w, rct_widgetindex widgetIndex);
 bool widget_is_active_tool(rct_window* w, rct_widgetindex widgetIndex);
 void widget_scroll_get_part(
-    rct_window* w,
-    rct_widget* widget,
-    int32_t x,
-    int32_t y,
-    int32_t* output_x,
-    int32_t* output_y,
-    int32_t* output_scroll_area,
+    rct_window* w, rct_widget* widget, int32_t x, int32_t y, int32_t* output_x, int32_t* output_y, int32_t* output_scroll_area,
     int32_t* scroll_id);
 
 void widget_set_enabled(rct_window* w, rct_widgetindex widgetIndex, bool enabled);
diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h
index 5e87c88ede..f98b4a44b6 100644
--- a/src/openrct2/interface/Window.h
+++ b/src/openrct2/interface/Window.h
@@ -575,12 +575,7 @@ void window_update_all();
 void window_set_window_limit(int32_t value);
 
 rct_window* window_create(
-    int32_t x,
-    int32_t y,
-    int32_t width,
-    int32_t height,
-    rct_window_event_list* event_handlers,
-    rct_windowclass cls,
+    int32_t x, int32_t y, int32_t width, int32_t height, rct_window_event_list* event_handlers, rct_windowclass cls,
     uint16_t flags);
 rct_window* window_create_auto_pos(
     int32_t width, int32_t height, rct_window_event_list* event_handlers, rct_windowclass cls, uint16_t flags);
@@ -740,21 +735,10 @@ void window_follow_sprite(rct_window* w, size_t spriteIndex);
 void window_unfollow_sprite(rct_window* w);
 
 bool window_ride_construction_update_state(
-    int32_t* trackType,
-    int32_t* trackDirection,
-    int32_t* rideIndex,
-    int32_t* _liftHillAndAlternativeState,
-    int32_t* x,
-    int32_t* y,
-    int32_t* z,
-    int32_t* properties);
+    int32_t* trackType, int32_t* trackDirection, int32_t* rideIndex, int32_t* _liftHillAndAlternativeState, int32_t* x,
+    int32_t* y, int32_t* z, int32_t* properties);
 money32 place_provisional_track_piece(
-    int32_t rideIndex,
-    int32_t trackType,
-    int32_t trackDirection,
-    int32_t liftHillAndAlternativeState,
-    int32_t x,
-    int32_t y,
+    int32_t rideIndex, int32_t trackType, int32_t trackDirection, int32_t liftHillAndAlternativeState, int32_t x, int32_t y,
     int32_t z);
 
 extern uint64_t _enabledRidePieces;
diff --git a/src/openrct2/localisation/Currency.cpp b/src/openrct2/localisation/Currency.cpp
index 2b7f9a8c66..0322681dba 100644
--- a/src/openrct2/localisation/Currency.cpp
+++ b/src/openrct2/localisation/Currency.cpp
@@ -42,8 +42,7 @@ void currency_load_custom_currency_config()
     if (gConfigGeneral.custom_currency_symbol != nullptr)
     {
         safe_strcpy(
-            CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode,
-            gConfigGeneral.custom_currency_symbol,
+            CurrencyDescriptors[CURRENCY_CUSTOM].symbol_unicode, gConfigGeneral.custom_currency_symbol,
             CURRENCY_SYMBOL_MAX_SIZE);
     }
 }
diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp
index baa604e89a..48a4e5e48f 100644
--- a/src/openrct2/management/Award.cpp
+++ b/src/openrct2/management/Award.cpp
@@ -543,9 +543,8 @@ static bool award_is_deserved_best_custom_designed_rides(int32_t activeAwardType
 }
 
 /** At least 5 colourful rides and more than half of the rides are colourful. */
-static constexpr const uint8_t dazzling_ride_colours[] = {
-    COLOUR_BRIGHT_PURPLE, COLOUR_BRIGHT_GREEN, COLOUR_LIGHT_ORANGE, COLOUR_BRIGHT_PINK
-};
+static constexpr const uint8_t dazzling_ride_colours[] = { COLOUR_BRIGHT_PURPLE, COLOUR_BRIGHT_GREEN, COLOUR_LIGHT_ORANGE,
+                                                           COLOUR_BRIGHT_PINK };
 
 static bool award_is_deserved_most_dazzling_ride_colours(int32_t activeAwardTypes)
 {
diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp
index ec9a3cce0a..ddf8d19c82 100644
--- a/src/openrct2/management/Research.cpp
+++ b/src/openrct2/management/Research.cpp
@@ -224,8 +224,7 @@ void research_finish_item(rct_research_item* researchItem)
 
             ride_type_set_invented(base_ride_type);
             openrct2_assert(
-                base_ride_type < Util::CountOf(RideTypePossibleTrackConfigurations),
-                "Invalid base_ride_type = %d",
+                base_ride_type < Util::CountOf(RideTypePossibleTrackConfigurations), "Invalid base_ride_type = %d",
                 base_ride_type);
 
             ride_entry_set_invented(rideEntryIndex);
diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp
index c0e28a8383..1dda32d93f 100644
--- a/src/openrct2/network/Network.cpp
+++ b/src/openrct2/network/Network.cpp
@@ -795,8 +795,7 @@ NetworkGroup* Network::AddGroup()
     for (int32_t id = 0; id < 255; id++)
     {
         if (std::find_if(
-                group_list.begin(),
-                group_list.end(),
+                group_list.begin(), group_list.end(),
                 [&id](std::unique_ptr<NetworkGroup> const& group) { return group->Id == id; })
             == group_list.end())
         {
@@ -845,9 +844,7 @@ uint8_t Network::GetGroupIDByHash(const std::string& keyhash)
         else
         {
             log_warning(
-                "User %s is assigned to non-existent group %u. Assigning to default group (%u)",
-                keyhash.c_str(),
-                assignedGroup,
+                "User %s is assigned to non-existent group %u. Assigning to default group (%u)", keyhash.c_str(), assignedGroup,
                 groupId);
         }
     }
@@ -1297,14 +1294,7 @@ void Network::Client_Send_GAMECMD(
 }
 
 void Network::Server_Send_GAMECMD(
-    uint32_t eax,
-    uint32_t ebx,
-    uint32_t ecx,
-    uint32_t edx,
-    uint32_t esi,
-    uint32_t edi,
-    uint32_t ebp,
-    uint8_t playerid,
+    uint32_t eax, uint32_t ebx, uint32_t ecx, uint32_t edx, uint32_t esi, uint32_t edi, uint32_t ebp, uint8_t playerid,
     uint8_t callback)
 {
     std::unique_ptr<NetworkPacket> packet(NetworkPacket::Allocate());
@@ -1583,9 +1573,7 @@ void Network::ProcessGameCommandQueue()
 
                 log_warning(
                     "Discarding game command from tick behind current tick, CMD: %08X, CMD Tick: %08X, Current Tick: %08X\n",
-                    gc.esi,
-                    gc.tick,
-                    gCurrentTicks);
+                    gc.esi, gc.tick, gCurrentTicks);
 
                 // At this point we should not return, would add the possibility to skip commands this tick.
                 continue;
@@ -1711,13 +1699,9 @@ void Network::RemoveClient(std::unique_ptr<NetworkConnection>& connection)
         {
             game_command_playerid = connection_player->Id;
             game_do_command(
-                pickup_peep->sprite_index,
-                GAME_COMMAND_FLAG_APPLY,
-                1,
-                0,
+                pickup_peep->sprite_index, GAME_COMMAND_FLAG_APPLY, 1, 0,
                 pickup_peep->type == PEEP_TYPE_GUEST ? GAME_COMMAND_PICKUP_GUEST : GAME_COMMAND_PICKUP_STAFF,
-                network_get_pickup_peep_old_x(connection_player->Id),
-                0);
+                network_get_pickup_peep_old_x(connection_player->Id), 0);
         }
         gNetwork.Server_Send_EVENT_PLAYER_DISCONNECTED(
             (char*)connection_player->Name.c_str(), connection->GetLastDisconnectReason());
@@ -1727,8 +1711,7 @@ void Network::RemoveClient(std::unique_ptr<NetworkConnection>& connection)
     }
     player_list.erase(
         std::remove_if(
-            player_list.begin(),
-            player_list.end(),
+            player_list.begin(), player_list.end(),
             [connection_player](std::unique_ptr<NetworkPlayer>& player) { return player.get() == connection_player; }),
         player_list.end());
     client_connection_list.remove(connection);
@@ -1749,8 +1732,7 @@ NetworkPlayer* Network::AddPlayer(const utf8* name, const std::string& keyhash)
         for (int32_t id = 0; id < 255; id++)
         {
             if (std::find_if(
-                    player_list.begin(),
-                    player_list.end(),
+                    player_list.begin(), player_list.end(),
                     [&id](std::unique_ptr<NetworkPlayer> const& player) { return player->Id == id; })
                 == player_list.end())
             {
@@ -2008,12 +1990,8 @@ void Network::Client_Handle_OBJECTS(NetworkConnection& connection, NetworkPacket
         else if (ori->ObjectEntry.checksum != checksum || ori->ObjectEntry.flags != flags)
         {
             log_warning(
-                "Object %s has different checksum/flags (%x/%x) than server (%x/%x).",
-                s.c_str(),
-                ori->ObjectEntry.checksum,
-                ori->ObjectEntry.flags,
-                checksum,
-                flags);
+                "Object %s has different checksum/flags (%x/%x) than server (%x/%x).", s.c_str(), ori->ObjectEntry.checksum,
+                ori->ObjectEntry.flags, checksum, flags);
         }
     }
     Client_Send_OBJECTS(requested_objects);
@@ -2991,13 +2969,8 @@ void network_chat_show_server_greeting()
 }
 
 void game_command_set_player_group(
-    [[maybe_unused]] int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi,
+    [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     uint8_t playerid = (uint8_t)*ecx;
     uint8_t groupid = (uint8_t)*edx;
@@ -3288,13 +3261,8 @@ void game_command_modify_groups(
 }
 
 void game_command_kick_player(
-    int32_t* eax,
-    int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    [[maybe_unused]] int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    int32_t* eax, int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx, [[maybe_unused]] int32_t* esi,
+    [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     uint8_t playerid = (uint8_t)*eax;
     NetworkPlayer* player = gNetwork.GetPlayerByID(playerid);
diff --git a/src/openrct2/network/TcpSocket.cpp b/src/openrct2/network/TcpSocket.cpp
index f66db50cc3..7bbc3c4f63 100644
--- a/src/openrct2/network/TcpSocket.cpp
+++ b/src/openrct2/network/TcpSocket.cpp
@@ -207,12 +207,7 @@ public:
             {
                 char hostName[NI_MAXHOST];
                 int32_t rc = getnameinfo(
-                    (struct sockaddr*)&client_addr,
-                    client_len,
-                    hostName,
-                    sizeof(hostName),
-                    nullptr,
-                    0,
+                    (struct sockaddr*)&client_addr, client_len, hostName, sizeof(hostName), nullptr, 0,
                     NI_NUMERICHOST | NI_NUMERICSERV);
                 SetTCPNoDelay(socket, true);
                 tcpSocket = new TcpSocket(socket);
diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h
index aa0df4268e..69fd224334 100644
--- a/src/openrct2/network/network.h
+++ b/src/openrct2/network/network.h
@@ -139,14 +139,7 @@ public:
     void Client_Send_GAMECMD(
         uint32_t eax, uint32_t ebx, uint32_t ecx, uint32_t edx, uint32_t esi, uint32_t edi, uint32_t ebp, uint8_t callback);
     void Server_Send_GAMECMD(
-        uint32_t eax,
-        uint32_t ebx,
-        uint32_t ecx,
-        uint32_t edx,
-        uint32_t esi,
-        uint32_t edi,
-        uint32_t ebp,
-        uint8_t playerid,
+        uint32_t eax, uint32_t ebx, uint32_t ecx, uint32_t edx, uint32_t esi, uint32_t edi, uint32_t ebp, uint8_t playerid,
         uint8_t callback);
     void Client_Send_GAME_ACTION(const GameAction* action);
     void Server_Send_GAME_ACTION(const GameAction* action);
diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp
index 99bdedd0e0..fd4fcafb70 100644
--- a/src/openrct2/object/ObjectFactory.cpp
+++ b/src/openrct2/object/ObjectFactory.cpp
@@ -99,9 +99,7 @@ public:
     }
 
     ReadObjectContext(
-        IObjectRepository& objectRepository,
-        const std::string& objectName,
-        bool loadImages,
+        IObjectRepository& objectRepository, const std::string& objectName, bool loadImages,
         const IFileDataRetriever* fileDataRetriever)
         : _objectRepository(objectRepository)
         , _fileDataRetriever(fileDataRetriever)
diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp
index fd004836ab..42685b096e 100644
--- a/src/openrct2/object/ObjectManager.cpp
+++ b/src/openrct2/object/ObjectManager.cpp
@@ -509,8 +509,7 @@ private:
                         func(i);
                     }
                 },
-                begin,
-                end);
+                begin, end);
         }
         for (auto& t : threads)
         {
diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp
index 057a5b64e1..16a9f2300b 100644
--- a/src/openrct2/object/ObjectRepository.cpp
+++ b/src/openrct2/object/ObjectRepository.cpp
@@ -80,11 +80,7 @@ private:
 public:
     explicit ObjectFileIndex(IObjectRepository& objectRepository, const IPlatformEnvironment& env)
         : FileIndex(
-              "object index",
-              MAGIC_NUMBER,
-              VERSION,
-              env.GetFilePath(PATHID::CACHE_OBJECTS),
-              std::string(PATTERN),
+              "object index", MAGIC_NUMBER, VERSION, env.GetFilePath(PATHID::CACHE_OBJECTS), std::string(PATTERN),
               std::vector<std::string>{
                   env.GetDirectoryPath(DIRBASE::OPENRCT2, DIRID::OBJECT),
                   env.GetDirectoryPath(DIRBASE::USER, DIRID::OBJECT),
diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp
index 0bd555bcc1..e3a95c7fa5 100644
--- a/src/openrct2/paint/Paint.cpp
+++ b/src/openrct2/paint/Paint.cpp
@@ -751,14 +751,8 @@ void paint_session_free([[maybe_unused]] paint_session* session)
  * @return (ebp) paint_struct on success (CF == 0), nullptr on failure (CF == 1)
  */
 paint_struct* sub_98196C(
-    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_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)
 {
     assert((uint16_t)bound_box_length_x == (int16_t)bound_box_length_x);
     assert((uint16_t)bound_box_length_y == (int16_t)bound_box_length_y);
@@ -907,17 +901,9 @@ paint_struct* sub_98196C(
  */
 // Track Pieces, Shops.
 paint_struct* sub_98197C(
-    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,
-    int16_t bound_box_offset_y,
-    int16_t bound_box_offset_z)
+    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,
+    int16_t bound_box_offset_y, int16_t bound_box_offset_z)
 {
     session->UnkF1AD28 = nullptr;
     session->UnkF1AD2C = nullptr;
@@ -974,17 +960,9 @@ paint_struct* sub_98197C(
  * @return (ebp) paint_struct on success (CF == 0), nullptr on failure (CF == 1)
  */
 paint_struct* sub_98198C(
-    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,
-    int16_t bound_box_offset_y,
-    int16_t bound_box_offset_z)
+    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,
+    int16_t bound_box_offset_y, int16_t bound_box_offset_z)
 {
     assert((uint16_t)bound_box_length_x == bound_box_length_x);
     assert((uint16_t)bound_box_length_y == bound_box_length_y);
@@ -1024,17 +1002,9 @@ paint_struct* sub_98198C(
  * @return (ebp) paint_struct on success (CF == 0), nullptr on failure (CF == 1)
  */
 paint_struct* sub_98199C(
-    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,
-    int16_t bound_box_offset_y,
-    int16_t bound_box_offset_z)
+    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,
+    int16_t bound_box_offset_y, int16_t bound_box_offset_z)
 {
     assert((uint16_t)bound_box_length_x == (int16_t)bound_box_length_x);
     assert((uint16_t)bound_box_length_y == (int16_t)bound_box_length_y);
@@ -1042,17 +1012,8 @@ paint_struct* sub_98199C(
     if (session->UnkF1AD28 == nullptr)
     {
         return sub_98197C(
-            session,
-            image_id,
-            x_offset,
-            y_offset,
-            bound_box_length_x,
-            bound_box_length_y,
-            bound_box_length_z,
-            z_offset,
-            bound_box_offset_x,
-            bound_box_offset_y,
-            bound_box_offset_z);
+            session, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset,
+            bound_box_offset_x, bound_box_offset_y, bound_box_offset_z);
     }
 
     LocationXYZ16 offset = { x_offset, y_offset, z_offset };
@@ -1160,13 +1121,7 @@ bool paint_attach_to_previous_ps(paint_session* session, uint32_t image_id, uint
  * @param rotation (ebp)
  */
 void paint_floating_money_effect(
-    paint_session* session,
-    money32 amount,
-    rct_string_id string_id,
-    int16_t y,
-    int16_t z,
-    int8_t y_offsets[],
-    int16_t offset_x,
+    paint_session* session, money32 amount, rct_string_id string_id, int16_t y, int16_t z, int8_t y_offsets[], int16_t offset_x,
     uint32_t rotation)
 {
     if (session->NextFreePaintStruct >= session->EndOfPaintStructArray)
diff --git a/src/openrct2/paint/Paint.h b/src/openrct2/paint/Paint.h
index 2e1b2bf613..09799b75e2 100644
--- a/src/openrct2/paint/Paint.h
+++ b/src/openrct2/paint/Paint.h
@@ -188,100 +188,39 @@ extern bool gPaintBlockedTiles;
 extern bool gPaintWidePathsAsGhost;
 
 paint_struct* sub_98196C(
-    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_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_98197C(
-    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,
-    int16_t bound_box_offset_y,
-    int16_t bound_box_offset_z);
+    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,
+    int16_t bound_box_offset_y, int16_t bound_box_offset_z);
 paint_struct* sub_98198C(
-    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,
-    int16_t bound_box_offset_y,
-    int16_t bound_box_offset_z);
+    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,
+    int16_t bound_box_offset_y, int16_t bound_box_offset_z);
 paint_struct* sub_98199C(
-    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,
-    int16_t bound_box_offset_y,
-    int16_t bound_box_offset_z);
+    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,
+    int16_t bound_box_offset_y, int16_t bound_box_offset_z);
 
 paint_struct* sub_98196C_rotated(
-    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_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* sub_98197C_rotated(
-    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,
-    int16_t bound_box_offset_x,
-    int16_t bound_box_offset_y,
-    int16_t bound_box_offset_z);
+    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, int16_t bound_box_offset_x,
+    int16_t bound_box_offset_y, int16_t bound_box_offset_z);
 paint_struct* sub_98199C_rotated(
-    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,
-    int16_t bound_box_offset_x,
-    int16_t bound_box_offset_y,
-    int16_t bound_box_offset_z);
+    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, int16_t bound_box_offset_x,
+    int16_t bound_box_offset_y, int16_t bound_box_offset_z);
 
 void paint_util_push_tunnel_rotated(paint_session* session, uint8_t direction, uint16_t height, uint8_t type);
 
 bool paint_attach_to_previous_attach(paint_session* session, uint32_t image_id, uint16_t x, uint16_t y);
 bool paint_attach_to_previous_ps(paint_session* session, uint32_t image_id, uint16_t x, uint16_t y);
 void paint_floating_money_effect(
-    paint_session* session,
-    money32 amount,
-    rct_string_id string_id,
-    int16_t y,
-    int16_t z,
-    int8_t y_offsets[],
-    int16_t offset_x,
+    paint_session* session, money32 amount, rct_string_id string_id, int16_t y, int16_t z, int8_t y_offsets[], int16_t offset_x,
     uint32_t rotation);
 
 paint_session* paint_session_alloc(rct_drawpixelinfo* dpi);
diff --git a/src/openrct2/paint/PaintHelpers.cpp b/src/openrct2/paint/PaintHelpers.cpp
index 4a7085049a..43a0f35f50 100644
--- a/src/openrct2/paint/PaintHelpers.cpp
+++ b/src/openrct2/paint/PaintHelpers.cpp
@@ -12,15 +12,8 @@
 #include "Paint.h"
 
 paint_struct* sub_98196C_rotated(
-    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_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)
     {
@@ -35,94 +28,40 @@ paint_struct* sub_98196C_rotated(
 }
 
 paint_struct* sub_98197C_rotated(
-    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,
-    int16_t bound_box_offset_x,
-    int16_t bound_box_offset_y,
-    int16_t bound_box_offset_z)
+    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, int16_t bound_box_offset_x,
+    int16_t bound_box_offset_y, int16_t bound_box_offset_z)
 {
     if (direction & 1)
     {
         return sub_98197C(
-            session,
-            image_id,
-            y_offset,
-            x_offset,
-            bound_box_length_y,
-            bound_box_length_x,
-            bound_box_length_z,
-            z_offset,
-            bound_box_offset_y,
-            bound_box_offset_x,
-            bound_box_offset_z);
+            session, image_id, y_offset, x_offset, bound_box_length_y, bound_box_length_x, bound_box_length_z, z_offset,
+            bound_box_offset_y, bound_box_offset_x, bound_box_offset_z);
     }
     else
     {
         return sub_98197C(
-            session,
-            image_id,
-            x_offset,
-            y_offset,
-            bound_box_length_x,
-            bound_box_length_y,
-            bound_box_length_z,
-            z_offset,
-            bound_box_offset_x,
-            bound_box_offset_y,
-            bound_box_offset_z);
+            session, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset,
+            bound_box_offset_x, bound_box_offset_y, bound_box_offset_z);
     }
 }
 
 paint_struct* sub_98199C_rotated(
-    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,
-    int16_t bound_box_offset_x,
-    int16_t bound_box_offset_y,
-    int16_t bound_box_offset_z)
+    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, int16_t bound_box_offset_x,
+    int16_t bound_box_offset_y, int16_t bound_box_offset_z)
 {
     if (direction & 1)
     {
         return sub_98199C(
-            session,
-            image_id,
-            y_offset,
-            x_offset,
-            bound_box_length_y,
-            bound_box_length_x,
-            bound_box_length_z,
-            z_offset,
-            bound_box_offset_y,
-            bound_box_offset_x,
-            bound_box_offset_z);
+            session, image_id, y_offset, x_offset, bound_box_length_y, bound_box_length_x, bound_box_length_z, z_offset,
+            bound_box_offset_y, bound_box_offset_x, bound_box_offset_z);
     }
     else
     {
         return sub_98199C(
-            session,
-            image_id,
-            x_offset,
-            y_offset,
-            bound_box_length_x,
-            bound_box_length_y,
-            bound_box_length_z,
-            z_offset,
-            bound_box_offset_x,
-            bound_box_offset_y,
-            bound_box_offset_z);
+            session, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset,
+            bound_box_offset_x, bound_box_offset_y, bound_box_offset_z);
     }
 }
 
diff --git a/src/openrct2/paint/Supports.cpp b/src/openrct2/paint/Supports.cpp
index e3d64464aa..b9fc55815a 100644
--- a/src/openrct2/paint/Supports.cpp
+++ b/src/openrct2/paint/Supports.cpp
@@ -484,16 +484,7 @@ bool wooden_a_supports_paint_setup(
             if (byte_97B23C[special].var_6 == 0 || session->WoodenSupportsPrependTo == nullptr)
             {
                 sub_98197C(
-                    session,
-                    imageId,
-                    0,
-                    0,
-                    bBox.length.x,
-                    bBox.length.y,
-                    bBox.length.z,
-                    z,
-                    bBox.offset.x,
-                    bBox.offset.y,
+                    session, imageId, 0, 0, bBox.length.x, bBox.length.y, bBox.length.z, z, bBox.offset.x, bBox.offset.y,
                     bBox.offset.z + z);
                 hasSupports = true;
             }
@@ -501,16 +492,7 @@ bool wooden_a_supports_paint_setup(
             {
                 hasSupports = true;
                 paint_struct* ps = sub_98198C(
-                    session,
-                    imageId,
-                    0,
-                    0,
-                    bBox.length.x,
-                    bBox.length.y,
-                    bBox.length.z,
-                    z,
-                    bBox.offset.x,
-                    bBox.offset.y,
+                    session, imageId, 0, 0, bBox.length.x, bBox.length.y, bBox.length.z, z, bBox.offset.x, bBox.offset.y,
                     bBox.offset.z + z);
                 if (ps != nullptr)
                 {
@@ -650,14 +632,8 @@ bool wooden_b_supports_paint_setup(
             if (baseHeight & 0x10 || heightSteps == 1 || baseHeight + 16 == session->WaterHeight)
             {
                 sub_98196C(
-                    session,
-                    WoodenSupportImageIds[supportType].half | imageColourFlags,
-                    0,
-                    0,
-                    32,
-                    32,
-                    ((heightSteps == 1) ? 7 : 12),
-                    baseHeight);
+                    session, WoodenSupportImageIds[supportType].half | imageColourFlags, 0, 0, 32, 32,
+                    ((heightSteps == 1) ? 7 : 12), baseHeight);
                 heightSteps -= 1;
                 baseHeight += 16;
                 _9E32B1 = true;
@@ -665,14 +641,8 @@ bool wooden_b_supports_paint_setup(
             else
             {
                 sub_98196C(
-                    session,
-                    WoodenSupportImageIds[supportType].full | imageColourFlags,
-                    0,
-                    0,
-                    32,
-                    32,
-                    ((heightSteps == 2) ? 23 : 28),
-                    baseHeight);
+                    session, WoodenSupportImageIds[supportType].full | imageColourFlags, 0, 0, 32, 32,
+                    ((heightSteps == 2) ? 23 : 28), baseHeight);
                 heightSteps -= 2;
                 baseHeight += 32;
                 _9E32B1 = true;
@@ -696,33 +666,15 @@ bool wooden_b_supports_paint_setup(
             if (supportsDesc.var_6 == 0 || session->WoodenSupportsPrependTo == nullptr)
             {
                 sub_98197C(
-                    session,
-                    imageId | imageColourFlags,
-                    0,
-                    0,
-                    boundBox.length.x,
-                    boundBox.length.y,
-                    boundBox.length.z,
-                    baseHeight,
-                    boundBox.offset.x,
-                    boundBox.offset.y,
-                    boundBox.offset.z + baseHeight);
+                    session, imageId | imageColourFlags, 0, 0, boundBox.length.x, boundBox.length.y, boundBox.length.z,
+                    baseHeight, boundBox.offset.x, boundBox.offset.y, boundBox.offset.z + baseHeight);
                 _9E32B1 = true;
             }
             else
             {
                 paint_struct* paintStruct = sub_98198C(
-                    session,
-                    imageId | imageColourFlags,
-                    0,
-                    0,
-                    boundBox.length.x,
-                    boundBox.length.y,
-                    boundBox.length.z,
-                    baseHeight,
-                    boundBox.offset.x,
-                    boundBox.offset.y,
-                    boundBox.offset.z + baseHeight);
+                    session, imageId | imageColourFlags, 0, 0, boundBox.length.x, boundBox.length.y, boundBox.length.z,
+                    baseHeight, boundBox.offset.x, boundBox.offset.y, boundBox.offset.z + baseHeight);
                 _9E32B1 = true;
                 if (paintStruct != nullptr)
                 {
@@ -1009,14 +961,9 @@ bool metal_b_supports_paint_setup(
         }
 
         sub_98196C(
-            session,
-            _metalSupportTypeToCrossbeamImages[supportType][ebp] | imageColourFlags,
-            loc_97AF20[originalSegment].x + loc_97B052[ebp].x,
-            loc_97AF20[originalSegment].y + loc_97B052[ebp].y,
-            _97B062[ebp].x,
-            _97B062[ebp].y,
-            1,
-            baseHeight);
+            session, _metalSupportTypeToCrossbeamImages[supportType][ebp] | imageColourFlags,
+            loc_97AF20[originalSegment].x + loc_97B052[ebp].x, loc_97AF20[originalSegment].y + loc_97B052[ebp].y,
+            _97B062[ebp].x, _97B062[ebp].y, 1, baseHeight);
     }
 
     int32_t si = baseHeight;
@@ -1032,13 +979,7 @@ bool metal_b_supports_paint_setup(
         uint32_t imageId = _97B15C[supportType].base_id + imageOffset;
 
         sub_98196C(
-            session,
-            imageId | imageColourFlags,
-            loc_97AF20[segment].x,
-            loc_97AF20[segment].y,
-            0,
-            0,
-            5,
+            session, imageId | imageColourFlags, loc_97AF20[segment].x, loc_97AF20[segment].y, 0, 0, 5,
             supportSegments[segment].height);
 
         baseHeight = supportSegments[segment].height + 6;
@@ -1054,14 +995,8 @@ bool metal_b_supports_paint_setup(
     if (heightDiff > 0)
     {
         sub_98196C(
-            session,
-            (_97B15C[supportType].beam_id + (heightDiff - 1)) | imageColourFlags,
-            loc_97AF20[segment].x,
-            loc_97AF20[segment].y,
-            0,
-            0,
-            heightDiff - 1,
-            baseHeight);
+            session, (_97B15C[supportType].beam_id + (heightDiff - 1)) | imageColourFlags, loc_97AF20[segment].x,
+            loc_97AF20[segment].y, 0, 0, heightDiff - 1, baseHeight);
     }
 
     baseHeight += heightDiff;
@@ -1096,13 +1031,7 @@ bool metal_b_supports_paint_setup(
         }
 
         sub_98196C(
-            session,
-            imageId | imageColourFlags,
-            loc_97AF20[segment].x,
-            loc_97AF20[segment].y,
-            0,
-            0,
-            beamLength - 1,
+            session, imageId | imageColourFlags, loc_97AF20[segment].x, loc_97AF20[segment].y, 0, 0, beamLength - 1,
             baseHeight);
 
         baseHeight += beamLength;
@@ -1132,17 +1061,8 @@ bool metal_b_supports_paint_setup(
 
             uint32_t imageId = _97B15C[supportType].beam_id + (beamLength - 1);
             sub_98197C(
-                session,
-                imageId | imageColourFlags,
-                loc_97AF20[originalSegment].x,
-                loc_97AF20[originalSegment].y,
-                0,
-                0,
-                0,
-                baseHeight,
-                loc_97AF20[originalSegment].x,
-                loc_97AF20[originalSegment].y,
-                height);
+                session, imageId | imageColourFlags, loc_97AF20[originalSegment].x, loc_97AF20[originalSegment].y, 0, 0, 0,
+                baseHeight, loc_97AF20[originalSegment].x, loc_97AF20[originalSegment].y, height);
             baseHeight += beamLength;
         }
     }
@@ -1163,13 +1083,8 @@ bool metal_b_supports_paint_setup(
  * @return Whether supports were drawn
  */
 bool path_a_supports_paint_setup(
-    paint_session* session,
-    int32_t supportType,
-    int32_t special,
-    int32_t height,
-    uint32_t imageColourFlags,
-    rct_footpath_entry* pathEntry,
-    bool* underground)
+    paint_session* session, int32_t supportType, int32_t special, int32_t height, uint32_t imageColourFlags,
+    rct_footpath_entry* pathEntry, bool* underground)
 {
     if (underground != nullptr)
     {
@@ -1279,33 +1194,15 @@ bool path_a_supports_paint_setup(
         if (supportsDesc.var_6 == 0 || session->WoodenSupportsPrependTo == nullptr)
         {
             sub_98197C(
-                session,
-                imageId | imageColourFlags,
-                0,
-                0,
-                boundBox.length.y,
-                boundBox.length.x,
-                boundBox.length.z,
-                baseHeight,
-                boundBox.offset.x,
-                boundBox.offset.y,
-                baseHeight + boundBox.offset.z);
+                session, imageId | imageColourFlags, 0, 0, boundBox.length.y, boundBox.length.x, boundBox.length.z, baseHeight,
+                boundBox.offset.x, boundBox.offset.y, baseHeight + boundBox.offset.z);
             hasSupports = true;
         }
         else
         {
             paint_struct* paintStruct = sub_98198C(
-                session,
-                imageId | imageColourFlags,
-                0,
-                0,
-                boundBox.length.y,
-                boundBox.length.x,
-                boundBox.length.z,
-                baseHeight,
-                boundBox.offset.x,
-                boundBox.offset.y,
-                baseHeight + boundBox.offset.z);
+                session, imageId | imageColourFlags, 0, 0, boundBox.length.y, boundBox.length.x, boundBox.length.z, baseHeight,
+                boundBox.offset.x, boundBox.offset.y, baseHeight + boundBox.offset.z);
             hasSupports = true;
             if (paintStruct != nullptr)
             {
@@ -1333,11 +1230,7 @@ bool path_a_supports_paint_setup(
  * @return Whether supports were drawn
  */
 bool path_b_supports_paint_setup(
-    paint_session* session,
-    int32_t segment,
-    int32_t special,
-    int32_t height,
-    uint32_t imageColourFlags,
+    paint_session* session, int32_t segment, int32_t special, int32_t height, uint32_t imageColourFlags,
     rct_footpath_entry* pathEntry)
 {
     support_height* supportSegments = session->SupportSegments;
@@ -1370,14 +1263,8 @@ bool path_b_supports_paint_setup(
         baseHeight = supportSegments[segment].height;
 
         sub_98196C(
-            session,
-            (pathEntry->bridge_image + 37 + imageOffset) | imageColourFlags,
-            loc_97AF20[segment].x,
-            loc_97AF20[segment].y,
-            0,
-            0,
-            5,
-            baseHeight);
+            session, (pathEntry->bridge_image + 37 + imageOffset) | imageColourFlags, loc_97AF20[segment].x,
+            loc_97AF20[segment].y, 0, 0, 5, baseHeight);
         baseHeight += 6;
     }
 
@@ -1395,14 +1282,8 @@ bool path_b_supports_paint_setup(
     if (heightDiff > 0)
     {
         sub_98196C(
-            session,
-            (pathEntry->bridge_image + 20 + (heightDiff - 1)) | imageColourFlags,
-            loc_97AF20[segment].x,
-            loc_97AF20[segment].y,
-            0,
-            0,
-            heightDiff - 1,
-            baseHeight);
+            session, (pathEntry->bridge_image + 20 + (heightDiff - 1)) | imageColourFlags, loc_97AF20[segment].x,
+            loc_97AF20[segment].y, 0, 0, heightDiff - 1, baseHeight);
     }
 
     baseHeight += heightDiff;
@@ -1434,14 +1315,8 @@ bool path_b_supports_paint_setup(
             }
 
             sub_98196C(
-                session,
-                (pathEntry->bridge_image + 20 + (z - 1)) | imageColourFlags,
-                loc_97AF20[segment].x,
-                loc_97AF20[segment].y,
-                0,
-                0,
-                (z - 1),
-                baseHeight);
+                session, (pathEntry->bridge_image + 20 + (z - 1)) | imageColourFlags, loc_97AF20[segment].x,
+                loc_97AF20[segment].y, 0, 0, (z - 1), baseHeight);
 
             baseHeight += z;
         }
@@ -1487,17 +1362,8 @@ bool path_b_supports_paint_setup(
 
             uint32_t imageId = pathEntry->bridge_image + 20 + (z - 1);
             sub_98197C(
-                session,
-                imageId | imageColourFlags,
-                loc_97AF20[segment].x,
-                loc_97AF20[segment].y,
-                0,
-                0,
-                0,
-                baseHeight,
-                loc_97AF20[segment].x,
-                loc_97AF20[segment].y,
-                baseHeight);
+                session, imageId | imageColourFlags, loc_97AF20[segment].x, loc_97AF20[segment].y, 0, 0, 0, baseHeight,
+                loc_97AF20[segment].x, loc_97AF20[segment].y, baseHeight);
 
             baseHeight += z;
         }
diff --git a/src/openrct2/paint/Supports.h b/src/openrct2/paint/Supports.h
index 64fafea0b8..e71078eedd 100644
--- a/src/openrct2/paint/Supports.h
+++ b/src/openrct2/paint/Supports.h
@@ -22,19 +22,10 @@ bool metal_a_supports_paint_setup(
 bool metal_b_supports_paint_setup(
     paint_session* session, uint8_t supportType, uint8_t segment, int32_t special, int32_t height, uint32_t imageColourFlags);
 bool path_a_supports_paint_setup(
-    paint_session* session,
-    int32_t supportType,
-    int32_t special,
-    int32_t height,
-    uint32_t imageColourFlags,
-    rct_footpath_entry* pathEntry,
-    bool* underground);
+    paint_session* session, int32_t supportType, int32_t special, int32_t height, uint32_t imageColourFlags,
+    rct_footpath_entry* pathEntry, bool* underground);
 bool path_b_supports_paint_setup(
-    paint_session* session,
-    int32_t supportType,
-    int32_t special,
-    int32_t height,
-    uint32_t imageColourFlags,
+    paint_session* session, int32_t supportType, int32_t special, int32_t height, uint32_t imageColourFlags,
     rct_footpath_entry* pathEntry);
 
 // There are 13 types of metal supports. A graphic showing all of them is available here:
diff --git a/src/openrct2/paint/VirtualFloor.cpp b/src/openrct2/paint/VirtualFloor.cpp
index fa8312bafa..72cfc48394 100644
--- a/src/openrct2/paint/VirtualFloor.cpp
+++ b/src/openrct2/paint/VirtualFloor.cpp
@@ -301,13 +301,8 @@ void virtual_floor_paint(paint_session* session)
     uint8_t litEdges = 0;
 
     virtual_floor_get_tile_properties(
-        session->MapPosition.x,
-        session->MapPosition.y,
-        virtualFloorClipHeight,
-        &weAreOccupied,
-        &occupiedEdges,
-        &weAreBelowGround,
-        &weAreLit);
+        session->MapPosition.x, session->MapPosition.y, virtualFloorClipHeight, &weAreOccupied, &occupiedEdges,
+        &weAreBelowGround, &weAreLit);
 
     // Move the bits around to match the current rotation
     occupiedEdges |= occupiedEdges << 4;
@@ -328,12 +323,7 @@ void virtual_floor_paint(paint_session* session)
         bool theyAreLit;
 
         virtual_floor_get_tile_properties(
-            theirLocationX,
-            theirLocationY,
-            virtualFloorClipHeight,
-            &theyAreOccupied,
-            &theirOccupiedEdges,
-            &theyAreBelowGround,
+            theirLocationX, theirLocationY, virtualFloorClipHeight, &theyAreOccupied, &theirOccupiedEdges, &theyAreBelowGround,
             &theyAreLit);
 
         if (theirOccupiedEdges & (1 << ((effectiveRotation + 2) % 4)))
@@ -363,61 +353,29 @@ void virtual_floor_paint(paint_session* session)
     {
         sub_98197C(
             session,
-            SPR_G2_SELECTION_EDGE_NE | (!(occupiedEdges & 0x1) ? ((litEdges & 0x1) ? remap_lit : remap_base) : remap_edge),
-            0,
-            0,
-            0,
-            0,
-            1,
-            _virtualFloorHeight,
-            5,
-            5,
-            _virtualFloorHeight + ((dullEdges & 0x1) ? -2 : 0));
+            SPR_G2_SELECTION_EDGE_NE | (!(occupiedEdges & 0x1) ? ((litEdges & 0x1) ? remap_lit : remap_base) : remap_edge), 0,
+            0, 0, 0, 1, _virtualFloorHeight, 5, 5, _virtualFloorHeight + ((dullEdges & 0x1) ? -2 : 0));
     }
     if (paintEdges & 0x2)
     {
         sub_98197C(
             session,
-            SPR_G2_SELECTION_EDGE_SE | (!(occupiedEdges & 0x2) ? ((litEdges & 0x2) ? remap_lit : remap_base) : remap_edge),
-            0,
-            0,
-            1,
-            1,
-            1,
-            _virtualFloorHeight,
-            16,
-            27,
-            _virtualFloorHeight + ((dullEdges & 0x2) ? -2 : 0));
+            SPR_G2_SELECTION_EDGE_SE | (!(occupiedEdges & 0x2) ? ((litEdges & 0x2) ? remap_lit : remap_base) : remap_edge), 0,
+            0, 1, 1, 1, _virtualFloorHeight, 16, 27, _virtualFloorHeight + ((dullEdges & 0x2) ? -2 : 0));
     }
     if (paintEdges & 0x4)
     {
         sub_98197C(
             session,
-            SPR_G2_SELECTION_EDGE_SW | (!(occupiedEdges & 0x4) ? ((litEdges & 0x4) ? remap_lit : remap_base) : remap_edge),
-            0,
-            0,
-            1,
-            1,
-            1,
-            _virtualFloorHeight,
-            27,
-            16,
-            _virtualFloorHeight + ((dullEdges & 0x4) ? -2 : 0));
+            SPR_G2_SELECTION_EDGE_SW | (!(occupiedEdges & 0x4) ? ((litEdges & 0x4) ? remap_lit : remap_base) : remap_edge), 0,
+            0, 1, 1, 1, _virtualFloorHeight, 27, 16, _virtualFloorHeight + ((dullEdges & 0x4) ? -2 : 0));
     }
     if (paintEdges & 0x8)
     {
         sub_98197C(
             session,
-            SPR_G2_SELECTION_EDGE_NW | (!(occupiedEdges & 0x8) ? ((litEdges & 0x8) ? remap_lit : remap_base) : remap_edge),
-            0,
-            0,
-            0,
-            0,
-            1,
-            _virtualFloorHeight,
-            5,
-            5,
-            _virtualFloorHeight + ((dullEdges & 0x8) ? -2 : 0));
+            SPR_G2_SELECTION_EDGE_NW | (!(occupiedEdges & 0x8) ? ((litEdges & 0x8) ? remap_lit : remap_base) : remap_edge), 0,
+            0, 0, 0, 1, _virtualFloorHeight, 5, 5, _virtualFloorHeight + ((dullEdges & 0x8) ? -2 : 0));
     }
 
     if (gConfigGeneral.virtual_floor_style != VIRTUAL_FLOOR_STYLE_GLASSY)
diff --git a/src/openrct2/paint/sprite/Paint.Misc.cpp b/src/openrct2/paint/sprite/Paint.Misc.cpp
index 946ac2dbc9..f74f57ce96 100644
--- a/src/openrct2/paint/sprite/Paint.Misc.cpp
+++ b/src/openrct2/paint/sprite/Paint.Misc.cpp
@@ -52,14 +52,8 @@ void misc_paint(paint_session* session, const rct_sprite* misc, int32_t imageDir
             money32 value;
             rct_string_id stringId = money_effect_get_string_id(moneyEffect, &value);
             paint_floating_money_effect(
-                session,
-                value,
-                stringId,
-                moneyEffect->y,
-                moneyEffect->z,
-                (int8_t*)&money_wave[moneyEffect->wiggle % 22],
-                moneyEffect->offset_x,
-                session->CurrentRotation);
+                session, value, stringId, moneyEffect->y, moneyEffect->z, (int8_t*)&money_wave[moneyEffect->wiggle % 22],
+                moneyEffect->offset_x, session->CurrentRotation);
             break;
         }
 
diff --git a/src/openrct2/paint/tile_element/Paint.Banner.cpp b/src/openrct2/paint/tile_element/Paint.Banner.cpp
index af330ce6c7..ae583fffb6 100644
--- a/src/openrct2/paint/tile_element/Paint.Banner.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Banner.cpp
@@ -116,15 +116,6 @@ void banner_paint(paint_session* session, uint8_t direction, int32_t height, con
     uint16_t scroll = (gCurrentTicks / 2) % string_width;
 
     sub_98199C(
-        session,
-        scrolling_text_setup(session, string_id, scroll, scrollingMode),
-        0,
-        0,
-        1,
-        1,
-        0x15,
-        height + 22,
-        boundBoxOffsetX,
-        boundBoxOffsetY,
-        boundBoxOffsetZ);
+        session, scrolling_text_setup(session, string_id, scroll, scrollingMode), 0, 0, 1, 1, 0x15, height + 22,
+        boundBoxOffsetX, boundBoxOffsetY, boundBoxOffsetZ);
 }
diff --git a/src/openrct2/paint/tile_element/Paint.Entrance.cpp b/src/openrct2/paint/tile_element/Paint.Entrance.cpp
index 54b3dd479e..8b8b86a1d9 100644
--- a/src/openrct2/paint/tile_element/Paint.Entrance.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Entrance.cpp
@@ -142,17 +142,8 @@ static void ride_entrance_exit_paint(
     {
         transparant_image_id += 4;
         sub_98199C(
-            session,
-            transparant_image_id,
-            0,
-            0,
-            lengthX,
-            lengthY,
-            ah,
-            height,
-            (direction & 1) ? 28 : 2,
-            (direction & 1) ? 2 : 28,
-            height);
+            session, transparant_image_id, 0, 0, lengthX, lengthY, ah, height, (direction & 1) ? 28 : 2,
+            (direction & 1) ? 2 : 28, height);
     }
 
     if (direction & 1)
@@ -195,17 +186,8 @@ static void ride_entrance_exit_paint(
         uint16_t scroll = (gCurrentTicks / 2) % string_width;
 
         sub_98199C(
-            session,
-            scrolling_text_setup(session, string_id, scroll, style->scrolling_mode),
-            0,
-            0,
-            0x1C,
-            0x1C,
-            0x33,
-            height + style->height,
-            2,
-            2,
-            height + style->height);
+            session, scrolling_text_setup(session, string_id, scroll, style->scrolling_mode), 0, 0, 0x1C, 0x1C, 0x33,
+            height + style->height, 2, 2, height + style->height);
     }
 
     image_id = _unk9E32BC;
diff --git a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp
index fe6df87d54..da3ed504d6 100644
--- a/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp
+++ b/src/openrct2/paint/tile_element/Paint.LargeScenery.cpp
@@ -25,11 +25,7 @@
 
 // 6B8172:
 static void large_scenery_paint_supports(
-    paint_session* session,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    uint32_t dword_F4387C,
+    paint_session* session, uint8_t direction, uint16_t height, const rct_tile_element* tileElement, uint32_t dword_F4387C,
     rct_large_scenery_tile* tile)
 {
     if (tile->flags & LARGE_SCENERY_TILE_FLAG_NO_SUPPORTS)
@@ -128,13 +124,8 @@ static int32_t div_to_minus_infinity(int32_t a, int32_t b)
 }
 
 static void large_scenery_sign_paint_line(
-    paint_session* session,
-    const utf8* str,
-    rct_large_scenery_text* text,
-    int32_t textImage,
-    int32_t textColour,
-    uint8_t direction,
-    int32_t y_offset)
+    paint_session* session, const utf8* str, rct_large_scenery_text* text, int32_t textImage, int32_t textColour,
+    uint8_t direction, int32_t y_offset)
 {
     const utf8* fitStr = large_scenery_sign_fit_text(str, text, false);
     int32_t width = large_scenery_sign_text_width(fitStr, text);
@@ -344,12 +335,7 @@ void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t hei
                 utf8 str[5] = { 0 };
                 utf8_write_codepoint(str, codepoint);
                 large_scenery_sign_paint_line(
-                    session,
-                    str,
-                    entry->large_scenery.text,
-                    entry->large_scenery.text_image,
-                    textColour,
-                    direction,
+                    session, str, entry->large_scenery.text, entry->large_scenery.text_image, textColour, direction,
                     y_offset - height2);
                 y_offset += large_scenery_sign_get_glyph(text, codepoint)->height * 2;
             }
@@ -391,12 +377,7 @@ void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t hei
                             src = spacesrc;
                         }
                         large_scenery_sign_paint_line(
-                            session,
-                            str1,
-                            entry->large_scenery.text,
-                            entry->large_scenery.text_image,
-                            textColour,
-                            direction,
+                            session, str1, entry->large_scenery.text, entry->large_scenery.text_image, textColour, direction,
                             y_offset);
                         y_offset += (large_scenery_sign_get_glyph(text, 'A')->height + 1) * 2;
                     }
@@ -404,12 +385,7 @@ void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t hei
                 else
                 {
                     large_scenery_sign_paint_line(
-                        session,
-                        signString,
-                        entry->large_scenery.text,
-                        entry->large_scenery.text_image,
-                        textColour,
-                        direction,
+                        session, signString, entry->large_scenery.text, entry->large_scenery.text_image, textColour, direction,
                         y_offset);
                 }
             }
@@ -417,12 +393,7 @@ void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t hei
             {
                 // Draw one-line sign:
                 large_scenery_sign_paint_line(
-                    session,
-                    signString,
-                    entry->large_scenery.text,
-                    entry->large_scenery.text_image,
-                    textColour,
-                    direction,
+                    session, signString, entry->large_scenery.text, entry->large_scenery.text_image, textColour, direction,
                     y_offset);
             }
         }
@@ -480,17 +451,8 @@ void large_scenery_paint(paint_session* session, uint8_t direction, uint16_t hei
     uint16_t string_width = gfx_get_string_width(signString);
     uint16_t scroll = (gCurrentTicks / 2) % string_width;
     sub_98199C(
-        session,
-        scrolling_text_setup(session, stringId, scroll, scrollMode),
-        0,
-        0,
-        1,
-        1,
-        21,
-        height + 25,
-        boxoffset.x,
-        boxoffset.y,
-        boxoffset.z);
+        session, scrolling_text_setup(session, stringId, scroll, scrollMode), 0, 0, 1, 1, 21, height + 25, boxoffset.x,
+        boxoffset.y, boxoffset.z);
 
     large_scenery_paint_supports(session, direction, height, tileElement, dword_F4387C, tile);
 }
diff --git a/src/openrct2/paint/tile_element/Paint.Path.cpp b/src/openrct2/paint/tile_element/Paint.Path.cpp
index e2fff39e61..2ec2da2579 100644
--- a/src/openrct2/paint/tile_element/Paint.Path.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Path.cpp
@@ -78,29 +78,15 @@ static constexpr const uint8_t byte_98D8A4[] = {
 // clang-format on
 
 void path_paint_box_support(
-    paint_session* session,
-    const rct_tile_element* tileElement,
-    int32_t height,
-    rct_footpath_entry* footpathEntry,
-    bool hasFences,
-    uint32_t imageFlags,
-    uint32_t sceneryImageFlags);
+    paint_session* session, const rct_tile_element* tileElement, int32_t height, rct_footpath_entry* footpathEntry,
+    bool hasFences, uint32_t imageFlags, uint32_t sceneryImageFlags);
 void path_paint_pole_support(
-    paint_session* session,
-    const rct_tile_element* tileElement,
-    int16_t height,
-    rct_footpath_entry* footpathEntry,
-    bool hasFences,
-    uint32_t imageFlags,
-    uint32_t sceneryImageFlags);
+    paint_session* session, const rct_tile_element* tileElement, int16_t height, rct_footpath_entry* footpathEntry,
+    bool hasFences, uint32_t imageFlags, uint32_t sceneryImageFlags);
 
 /* rct2: 0x006A5AE5 */
 static void path_bit_lights_paint(
-    paint_session* session,
-    rct_scenery_entry* pathBitEntry,
-    const rct_tile_element* tileElement,
-    int32_t height,
-    uint8_t edges,
+    paint_session* session, rct_scenery_entry* pathBitEntry, const rct_tile_element* tileElement, int32_t height, uint8_t edges,
     uint32_t pathBitImageFlags)
 {
     if (footpath_element_is_sloped(tileElement))
@@ -158,11 +144,7 @@ static void path_bit_lights_paint(
 
 /* rct2: 0x006A5C94 */
 static void path_bit_bins_paint(
-    paint_session* session,
-    rct_scenery_entry* pathBitEntry,
-    const rct_tile_element* tileElement,
-    int32_t height,
-    uint8_t edges,
+    paint_session* session, rct_scenery_entry* pathBitEntry, const rct_tile_element* tileElement, int32_t height, uint8_t edges,
     uint32_t pathBitImageFlags)
 {
     if (footpath_element_is_sloped(tileElement))
@@ -261,11 +243,7 @@ static void path_bit_bins_paint(
 
 /* rct2: 0x006A5E81 */
 static void path_bit_benches_paint(
-    paint_session* session,
-    rct_scenery_entry* pathBitEntry,
-    const rct_tile_element* tileElement,
-    int32_t height,
-    uint8_t edges,
+    paint_session* session, rct_scenery_entry* pathBitEntry, const rct_tile_element* tileElement, int32_t height, uint8_t edges,
     uint32_t pathBitImageFlags)
 {
     uint32_t imageId;
@@ -339,14 +317,8 @@ static void path_bit_jumping_fountains_paint(
  * @param tile_element (esi)
  */
 static void sub_6A4101(
-    paint_session* session,
-    const rct_tile_element* tile_element,
-    uint16_t height,
-    uint32_t ebp,
-    bool word_F3F038,
-    rct_footpath_entry* footpathEntry,
-    uint32_t base_image_id,
-    uint32_t imageFlags)
+    paint_session* session, const rct_tile_element* tile_element, uint16_t height, uint32_t ebp, bool word_F3F038,
+    rct_footpath_entry* footpathEntry, uint32_t base_image_id, uint32_t imageFlags)
 {
     if (footpath_element_is_queue(tile_element))
     {
@@ -389,16 +361,7 @@ static void sub_6A4101(
                 case 3:
                     sub_98197C(session, 90 + base_image_id, 0, 4, 28, 1, 7, height, 0, 4, height + 2);
                     sub_98197C(
-                        session,
-                        91 + base_image_id,
-                        28,
-                        0,
-                        1,
-                        28,
-                        7,
-                        height,
-                        28,
-                        4,
+                        session, 91 + base_image_id, 28, 0, 1, 28, 7, height, 28, 4,
                         height + 2); // bound_box_offset_y seems to be a bug
                     sub_98197C(session, 98 + base_image_id, 0, 0, 4, 4, 7, height, 0, 28, height + 2);
                     break;
@@ -431,16 +394,7 @@ static void sub_6A4101(
                 case 12:
                     sub_98197C(session, 89 + base_image_id, 4, 0, 1, 28, 7, height, 4, 0, height + 2);
                     sub_98197C(
-                        session,
-                        92 + base_image_id,
-                        0,
-                        28,
-                        28,
-                        1,
-                        7,
-                        height,
-                        4,
-                        28,
+                        session, 92 + base_image_id, 0, 28, 28, 1, 7, height, 4, 28,
                         height + 2); // bound_box_offset_x seems to be a bug
                     sub_98197C(session, 100 + base_image_id, 0, 0, 4, 4, 7, height, 28, 0, height + 2);
                     break;
@@ -466,8 +420,7 @@ static void sub_6A4101(
         direction += session->CurrentRotation;
         direction &= 3;
 
-        LocationXYZ16 boundBoxOffsets = { BannerBoundBoxes[direction][0].x,
-                                          BannerBoundBoxes[direction][0].y,
+        LocationXYZ16 boundBoxOffsets = { BannerBoundBoxes[direction][0].x, BannerBoundBoxes[direction][0].y,
                                           static_cast<int16_t>(height + 2) };
 
         uint32_t imageId = (direction << 1) + base_image_id + 101;
@@ -514,17 +467,8 @@ static void sub_6A4101(
             uint16_t scroll = (gCurrentTicks / 2) % string_width;
 
             sub_98199C(
-                session,
-                scrolling_text_setup(session, string_id, scroll, scrollingMode),
-                0,
-                0,
-                1,
-                1,
-                21,
-                height + 7,
-                boundBoxOffsets.x,
-                boundBoxOffsets.y,
-                boundBoxOffsets.z);
+                session, scrolling_text_setup(session, string_id, scroll, scrollingMode), 0, 0, 1, 1, 21, height + 7,
+                boundBoxOffsets.x, boundBoxOffsets.y, boundBoxOffsets.z);
         }
 
         session->InteractionType = VIEWPORT_INTERACTION_ITEM_FOOTPATH;
@@ -606,16 +550,7 @@ static void sub_6A4101(
             case 3:
                 sub_98197C(session, 76 + base_image_id, 0, 4, 28, 1, 7, height, 0, 4, height + 2);
                 sub_98197C(
-                    session,
-                    77 + base_image_id,
-                    28,
-                    0,
-                    1,
-                    28,
-                    7,
-                    height,
-                    28,
-                    4,
+                    session, 77 + base_image_id, 28, 0, 1, 28, 7, height, 28, 4,
                     height + 2); // bound_box_offset_y seems to be a bug
                 if (!(dword_F3EF80 & 0x10))
                 {
@@ -641,16 +576,7 @@ static void sub_6A4101(
             case 12:
                 sub_98197C(session, 75 + base_image_id, 4, 0, 1, 28, 7, height, 4, 0, height + 2);
                 sub_98197C(
-                    session,
-                    78 + base_image_id,
-                    0,
-                    28,
-                    28,
-                    1,
-                    7,
-                    height,
-                    4,
-                    28,
+                    session, 78 + base_image_id, 0, 28, 28, 1, 7, height, 4, 28,
                     height + 2); // bound_box_offset_x seems to be a bug
                 if (!(dword_F3EF80 & 0x40))
                 {
@@ -735,14 +661,8 @@ static void sub_6A4101(
  * @param sceneryImageFlags (0x00F3EF74)
  */
 static void sub_6A3F61(
-    paint_session* session,
-    const rct_tile_element* tile_element,
-    uint16_t connectedEdges,
-    uint16_t height,
-    rct_footpath_entry* footpathEntry,
-    uint32_t imageFlags,
-    uint32_t sceneryImageFlags,
-    bool word_F3F038)
+    paint_session* session, const rct_tile_element* tile_element, uint16_t connectedEdges, uint16_t height,
+    rct_footpath_entry* footpathEntry, uint32_t imageFlags, uint32_t sceneryImageFlags, bool word_F3F038)
 {
     // eax --
     // ebx --
@@ -811,13 +731,7 @@ static void sub_6A3F61(
         // Redundant zoom-level check removed
 
         sub_6A4101(
-            session,
-            tile_element,
-            height,
-            connectedEdges,
-            word_F3F038,
-            footpathEntry,
-            footpathEntry->image | imageFlags,
+            session, tile_element, height, connectedEdges, word_F3F038, footpathEntry, footpathEntry->image | imageFlags,
             imageFlags);
     }
 
@@ -1057,13 +971,8 @@ void path_paint(paint_session* session, uint16_t height, const rct_tile_element*
 }
 
 void path_paint_box_support(
-    paint_session* session,
-    const rct_tile_element* tileElement,
-    int32_t height,
-    rct_footpath_entry* footpathEntry,
-    bool hasFences,
-    uint32_t imageFlags,
-    uint32_t sceneryImageFlags)
+    paint_session* session, const rct_tile_element* tileElement, int32_t height, rct_footpath_entry* footpathEntry,
+    bool hasFences, uint32_t imageFlags, uint32_t sceneryImageFlags)
 {
     // Rol edges around rotation
     uint8_t edges = ((tileElement->properties.path.edges << session->CurrentRotation) & 0xF)
@@ -1119,16 +1028,7 @@ void path_paint_box_support(
     if (!hasFences || !session->DidPassSurface)
     {
         sub_98197C(
-            session,
-            imageId | imageFlags,
-            0,
-            0,
-            boundBoxSize.x,
-            boundBoxSize.y,
-            0,
-            height,
-            boundBoxOffset.x,
-            boundBoxOffset.y,
+            session, imageId | imageFlags, 0, 0, boundBoxSize.x, boundBoxSize.y, 0, height, boundBoxOffset.x, boundBoxOffset.y,
             height + boundingBoxZOffset);
     }
     else
@@ -1146,16 +1046,7 @@ void path_paint_box_support(
         }
 
         sub_98197C(
-            session,
-            image_id | imageFlags,
-            0,
-            0,
-            boundBoxSize.x,
-            boundBoxSize.y,
-            0,
-            height,
-            boundBoxOffset.x,
-            boundBoxOffset.y,
+            session, image_id | imageFlags, 0, 0, boundBoxSize.x, boundBoxSize.y, 0, height, boundBoxOffset.x, boundBoxOffset.y,
             height + boundingBoxZOffset);
 
         if (!footpath_element_is_queue(tileElement) && !(footpathEntry->flags & FOOTPATH_ENTRY_FLAG_HAS_PATH_BASE_SPRITE))
@@ -1165,17 +1056,8 @@ void path_paint_box_support(
         else
         {
             sub_98199C(
-                session,
-                imageId | imageFlags,
-                0,
-                0,
-                boundBoxSize.x,
-                boundBoxSize.y,
-                0,
-                height,
-                boundBoxOffset.x,
-                boundBoxOffset.y,
-                height + boundingBoxZOffset);
+                session, imageId | imageFlags, 0, 0, boundBoxSize.x, boundBoxSize.y, 0, height, boundBoxOffset.x,
+                boundBoxOffset.y, height + boundingBoxZOffset);
         }
     }
 
@@ -1240,13 +1122,8 @@ void path_paint_box_support(
 }
 
 void path_paint_pole_support(
-    paint_session* session,
-    const rct_tile_element* tileElement,
-    int16_t height,
-    rct_footpath_entry* footpathEntry,
-    bool hasFences,
-    uint32_t imageFlags,
-    uint32_t sceneryImageFlags)
+    paint_session* session, const rct_tile_element* tileElement, int16_t height, rct_footpath_entry* footpathEntry,
+    bool hasFences, uint32_t imageFlags, uint32_t sceneryImageFlags)
 {
     // Rol edges around rotation
     uint8_t edges = ((tileElement->properties.path.edges << session->CurrentRotation) & 0xF)
@@ -1302,16 +1179,7 @@ void path_paint_pole_support(
     if (!hasFences || !session->DidPassSurface)
     {
         sub_98197C(
-            session,
-            imageId | imageFlags,
-            0,
-            0,
-            boundBoxSize.x,
-            boundBoxSize.y,
-            0,
-            height,
-            boundBoxOffset.x,
-            boundBoxOffset.y,
+            session, imageId | imageFlags, 0, 0, boundBoxSize.x, boundBoxSize.y, 0, height, boundBoxOffset.x, boundBoxOffset.y,
             height + boundingBoxZOffset);
     }
     else
@@ -1330,32 +1198,14 @@ void path_paint_pole_support(
         }
 
         sub_98197C(
-            session,
-            bridgeImage | imageFlags,
-            0,
-            0,
-            boundBoxSize.x,
-            boundBoxSize.y,
-            0,
-            height,
-            boundBoxOffset.x,
-            boundBoxOffset.y,
-            height + boundingBoxZOffset);
+            session, bridgeImage | imageFlags, 0, 0, boundBoxSize.x, boundBoxSize.y, 0, height, boundBoxOffset.x,
+            boundBoxOffset.y, height + boundingBoxZOffset);
 
         if (footpath_element_is_queue(tileElement) || (footpathEntry->flags & FOOTPATH_ENTRY_FLAG_HAS_PATH_BASE_SPRITE))
         {
             sub_98199C(
-                session,
-                imageId | imageFlags,
-                0,
-                0,
-                boundBoxSize.x,
-                boundBoxSize.y,
-                0,
-                height,
-                boundBoxOffset.x,
-                boundBoxOffset.y,
-                height + boundingBoxZOffset);
+                session, imageId | imageFlags, 0, 0, boundBoxSize.x, boundBoxSize.y, 0, height, boundBoxOffset.x,
+                boundBoxOffset.y, height + boundingBoxZOffset);
         }
     }
 
diff --git a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp
index e034166d7f..e99d47edec 100644
--- a/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp
+++ b/src/openrct2/paint/tile_element/Paint.SmallScenery.cpp
@@ -156,17 +156,8 @@ void scenery_paint(paint_session* session, uint8_t direction, int32_t height, co
     if (!(scenery_small_entry_has_flag(entry, SMALL_SCENERY_FLAG_VISIBLE_WHEN_ZOOMED)))
     {
         sub_98197C(
-            session,
-            baseImageid,
-            x_offset,
-            y_offset,
-            boxlength.x,
-            boxlength.y,
-            boxlength.z - 1,
-            height,
-            boxoffset.x,
-            boxoffset.y,
-            boxoffset.z);
+            session, baseImageid, x_offset, y_offset, boxlength.x, boxlength.y, boxlength.z - 1, height, boxoffset.x,
+            boxoffset.y, boxoffset.z);
     }
 
     if (scenery_small_entry_has_flag(entry, SMALL_SCENERY_FLAG_HAS_GLASS))
@@ -178,17 +169,8 @@ void scenery_paint(paint_session* session, uint8_t direction, int32_t height, co
             int32_t image_id = (baseImageid & 0x7FFFF) + (GlassPaletteIds[scenery_small_get_primary_colour(tileElement)] << 19)
                 + 0x40000004;
             sub_98199C(
-                session,
-                image_id,
-                x_offset,
-                y_offset,
-                boxlength.x,
-                boxlength.y,
-                boxlength.z - 1,
-                height,
-                boxoffset.x,
-                boxoffset.y,
-                boxoffset.z);
+                session, image_id, x_offset, y_offset, boxlength.x, boxlength.y, boxlength.z - 1, height, boxoffset.x,
+                boxoffset.y, boxoffset.z);
         }
     }
 
@@ -207,17 +189,8 @@ void scenery_paint(paint_session* session, uint8_t direction, int32_t height, co
                     image_id = (image_id & 0x7FFFF) | dword_F64EB0;
                 }
                 sub_98199C(
-                    session,
-                    image_id,
-                    x_offset,
-                    y_offset,
-                    boxlength.x,
-                    boxlength.y,
-                    boxlength.z - 1,
-                    height,
-                    boxoffset.x,
-                    boxoffset.y,
-                    boxoffset.z);
+                    session, image_id, x_offset, y_offset, boxlength.x, boxlength.y, boxlength.z - 1, height, boxoffset.x,
+                    boxoffset.y, boxoffset.z);
             }
             else if (scenery_small_entry_has_flag(entry, SMALL_SCENERY_FLAG_FOUNTAIN_SPRAY_4))
             {
@@ -228,17 +201,8 @@ void scenery_paint(paint_session* session, uint8_t direction, int32_t height, co
                     image_id = (image_id & 0x7FFFF) | dword_F64EB0;
                 }
                 sub_98199C(
-                    session,
-                    image_id,
-                    x_offset,
-                    y_offset,
-                    boxlength.x,
-                    boxlength.y,
-                    boxlength.z - 1,
-                    height,
-                    boxoffset.x,
-                    boxoffset.y,
-                    boxoffset.z);
+                    session, image_id, x_offset, y_offset, boxlength.x, boxlength.y, boxlength.z - 1, height, boxoffset.x,
+                    boxoffset.y, boxoffset.z);
 
                 image_id = direction + entry->image + 4;
                 if (dword_F64EB0 != 0)
@@ -246,17 +210,8 @@ void scenery_paint(paint_session* session, uint8_t direction, int32_t height, co
                     image_id = (image_id & 0x7FFFF) | dword_F64EB0;
                 }
                 sub_98199C(
-                    session,
-                    image_id,
-                    x_offset,
-                    y_offset,
-                    boxlength.x,
-                    boxlength.y,
-                    boxlength.z - 1,
-                    height,
-                    boxoffset.x,
-                    boxoffset.y,
-                    boxoffset.z);
+                    session, image_id, x_offset, y_offset, boxlength.x, boxlength.y, boxlength.z - 1, height, boxoffset.x,
+                    boxoffset.y, boxoffset.z);
 
                 image_id = ((gCurrentTicks / 2) & 0xF) + entry->image + 24;
                 if (dword_F64EB0 != 0)
@@ -264,17 +219,8 @@ void scenery_paint(paint_session* session, uint8_t direction, int32_t height, co
                     image_id = (image_id & 0x7FFFF) | dword_F64EB0;
                 }
                 sub_98199C(
-                    session,
-                    image_id,
-                    x_offset,
-                    y_offset,
-                    boxlength.x,
-                    boxlength.y,
-                    boxlength.z - 1,
-                    height,
-                    boxoffset.x,
-                    boxoffset.y,
-                    boxoffset.z);
+                    session, image_id, x_offset, y_offset, boxlength.x, boxlength.y, boxlength.z - 1, height, boxoffset.x,
+                    boxoffset.y, boxoffset.z);
             }
             else if (scenery_small_entry_has_flag(entry, SMALL_SCENERY_FLAG_IS_CLOCK))
             {
@@ -302,17 +248,8 @@ void scenery_paint(paint_session* session, uint8_t direction, int32_t height, co
                     image_id = (image_id & 0x7FFFF) | dword_F64EB0;
                 }
                 sub_98199C(
-                    session,
-                    image_id,
-                    x_offset,
-                    y_offset,
-                    boxlength.x,
-                    boxlength.y,
-                    boxlength.z - 1,
-                    height,
-                    boxoffset.x,
-                    boxoffset.y,
-                    boxoffset.z);
+                    session, image_id, x_offset, y_offset, boxlength.x, boxlength.y, boxlength.z - 1, height, boxoffset.x,
+                    boxoffset.y, boxoffset.z);
 
                 image_id = gRealTimeOfDay.minute + (direction * 15);
                 if (image_id >= 60)
@@ -325,17 +262,8 @@ void scenery_paint(paint_session* session, uint8_t direction, int32_t height, co
                     image_id = (image_id & 0x7FFFF) | dword_F64EB0;
                 }
                 sub_98199C(
-                    session,
-                    image_id,
-                    x_offset,
-                    y_offset,
-                    boxlength.x,
-                    boxlength.y,
-                    boxlength.z - 1,
-                    height,
-                    boxoffset.x,
-                    boxoffset.y,
-                    boxoffset.z);
+                    session, image_id, x_offset, y_offset, boxlength.x, boxlength.y, boxlength.z - 1, height, boxoffset.x,
+                    boxoffset.y, boxoffset.z);
             }
             else if (scenery_small_entry_has_flag(entry, SMALL_SCENERY_FLAG_SWAMP_GOO))
             {
@@ -350,17 +278,8 @@ void scenery_paint(paint_session* session, uint8_t direction, int32_t height, co
                     image_id = (image_id & 0x7FFFF) | dword_F64EB0;
                 }
                 sub_98199C(
-                    session,
-                    image_id,
-                    x_offset,
-                    y_offset,
-                    boxlength.x,
-                    boxlength.y,
-                    boxlength.z - 1,
-                    height,
-                    boxoffset.x,
-                    boxoffset.y,
-                    boxoffset.z);
+                    session, image_id, x_offset, y_offset, boxlength.x, boxlength.y, boxlength.z - 1, height, boxoffset.x,
+                    boxoffset.y, boxoffset.z);
             }
             else if (scenery_small_entry_has_flag(entry, SMALL_SCENERY_FLAG_HAS_FRAME_OFFSETS))
             {
@@ -404,32 +323,14 @@ void scenery_paint(paint_session* session, uint8_t direction, int32_t height, co
                 if (scenery_small_entry_has_flag(entry, SMALL_SCENERY_FLAG_VISIBLE_WHEN_ZOOMED))
                 {
                     sub_98197C(
-                        session,
-                        image_id,
-                        x_offset,
-                        y_offset,
-                        boxlength.x,
-                        boxlength.y,
-                        boxlength.z - 1,
-                        height,
-                        boxoffset.x,
-                        boxoffset.y,
-                        boxoffset.z);
+                        session, image_id, x_offset, y_offset, boxlength.x, boxlength.y, boxlength.z - 1, height, boxoffset.x,
+                        boxoffset.y, boxoffset.z);
                 }
                 else
                 {
                     sub_98199C(
-                        session,
-                        image_id,
-                        x_offset,
-                        y_offset,
-                        boxlength.x,
-                        boxlength.y,
-                        boxlength.z - 1,
-                        height,
-                        boxoffset.x,
-                        boxoffset.y,
-                        boxoffset.z);
+                        session, image_id, x_offset, y_offset, boxlength.x, boxlength.y, boxlength.z - 1, height, boxoffset.x,
+                        boxoffset.y, boxoffset.z);
                 }
             }
         }
diff --git a/src/openrct2/paint/tile_element/Paint.Surface.cpp b/src/openrct2/paint/tile_element/Paint.Surface.cpp
index 5d876c19b7..ce3252681d 100644
--- a/src/openrct2/paint/tile_element/Paint.Surface.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Surface.cpp
@@ -633,13 +633,8 @@ static bool tile_is_inside_clip_view(const tile_descriptor& tile)
 }
 
 static void viewport_surface_draw_tile_side_bottom(
-    paint_session* session,
-    enum edge_t edge,
-    uint8_t height,
-    uint8_t edgeStyle,
-    struct tile_descriptor self,
-    struct tile_descriptor neighbour,
-    bool isWater)
+    paint_session* session, enum edge_t edge, uint8_t height, uint8_t edgeStyle, struct tile_descriptor self,
+    struct tile_descriptor neighbour, bool isWater)
 {
     int16_t cornerHeight1, neighbourCornerHeight1, cornerHeight2, neighbourCornerHeight2;
 
@@ -809,16 +804,7 @@ static void viewport_surface_draw_tile_side_bottom(
 
         uint32_t image_id = get_tunnel_image(edgeStyle, tunnelType) + (edge == EDGE_BOTTOMRIGHT ? 2 : 0);
         sub_98197C(
-            session,
-            image_id,
-            offset.x,
-            offset.y,
-            tunnelBounds.x,
-            tunnelBounds.y,
-            boundBoxLength - 1,
-            zOffset,
-            0,
-            0,
+            session, image_id, offset.x, offset.y, tunnelBounds.x, tunnelBounds.y, boundBoxLength - 1, zOffset, 0, 0,
             boundBoxOffsetZ);
 
         boundBoxOffsetZ = curHeight * 16;
@@ -832,17 +818,8 @@ static void viewport_surface_draw_tile_side_bottom(
 
         image_id = get_tunnel_image(edgeStyle, tunnelType) + (edge == EDGE_BOTTOMRIGHT ? 2 : 0) + 1;
         sub_98197C(
-            session,
-            image_id,
-            offset.x,
-            offset.y,
-            tunnelBounds.x,
-            tunnelBounds.y,
-            boundBoxLength - 1,
-            curHeight * 16,
-            tunnelTopBoundBoxOffset.x,
-            tunnelTopBoundBoxOffset.y,
-            boundBoxOffsetZ);
+            session, image_id, offset.x, offset.y, tunnelBounds.x, tunnelBounds.y, boundBoxLength - 1, curHeight * 16,
+            tunnelTopBoundBoxOffset.x, tunnelTopBoundBoxOffset.y, boundBoxOffsetZ);
 
         curHeight += _tunnelHeights[tunnelType][0];
         tunnelIndex++;
@@ -853,11 +830,7 @@ static void viewport_surface_draw_tile_side_bottom(
  *  rct2: 0x0065EB7D, 0x0065F0D8
  */
 static void viewport_surface_draw_land_side_bottom(
-    paint_session* session,
-    enum edge_t edge,
-    uint8_t height,
-    uint8_t edgeStyle,
-    struct tile_descriptor self,
+    paint_session* session, enum edge_t edge, uint8_t height, uint8_t edgeStyle, struct tile_descriptor self,
     struct tile_descriptor neighbour)
 {
     viewport_surface_draw_tile_side_bottom(session, edge, height, edgeStyle, self, neighbour, false);
@@ -867,24 +840,15 @@ static void viewport_surface_draw_land_side_bottom(
  *  rct2: 0x0065F8B9, 0x0065FE26
  */
 static void viewport_surface_draw_water_side_bottom(
-    paint_session* session,
-    enum edge_t edge,
-    uint8_t height,
-    uint8_t edgeStyle,
-    struct tile_descriptor self,
+    paint_session* session, enum edge_t edge, uint8_t height, uint8_t edgeStyle, struct tile_descriptor self,
     struct tile_descriptor neighbour)
 {
     viewport_surface_draw_tile_side_bottom(session, edge, height, edgeStyle, self, neighbour, true);
 }
 
 static void viewport_surface_draw_tile_side_top(
-    paint_session* session,
-    enum edge_t edge,
-    uint8_t height,
-    uint8_t terrain,
-    struct tile_descriptor self,
-    struct tile_descriptor neighbour,
-    bool isWater)
+    paint_session* session, enum edge_t edge, uint8_t height, uint8_t terrain, struct tile_descriptor self,
+    struct tile_descriptor neighbour, bool isWater)
 {
     if (!is_csg_loaded() && terrain >= TERRAIN_EDGE_RCT2_COUNT)
         terrain = TERRAIN_EDGE_ROCK;
@@ -1027,11 +991,7 @@ static void viewport_surface_draw_tile_side_top(
  *  rct2: 0x0065F63B, 0x0065F77D
  */
 static void viewport_surface_draw_land_side_top(
-    paint_session* session,
-    enum edge_t edge,
-    uint8_t height,
-    uint8_t terrain,
-    struct tile_descriptor self,
+    paint_session* session, enum edge_t edge, uint8_t height, uint8_t terrain, struct tile_descriptor self,
     struct tile_descriptor neighbour)
 {
     viewport_surface_draw_tile_side_top(session, edge, height, terrain, self, neighbour, false);
@@ -1041,11 +1001,7 @@ static void viewport_surface_draw_land_side_top(
  *  rct2: 0x0066039B, 0x006604F1
  */
 static void viewport_surface_draw_water_side_top(
-    paint_session* session,
-    enum edge_t edge,
-    uint8_t height,
-    uint8_t terrain,
-    struct tile_descriptor self,
+    paint_session* session, enum edge_t edge, uint8_t height, uint8_t terrain, struct tile_descriptor self,
     struct tile_descriptor neighbour)
 {
     viewport_surface_draw_tile_side_top(session, edge, height, terrain, self, neighbour, true);
@@ -1569,17 +1525,8 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
             }
 
             sub_98197C(
-                session,
-                image_id,
-                fenceData.offset.x,
-                fenceData.offset.y,
-                fenceData.box_size.x,
-                fenceData.box_size.y,
-                9,
-                local_height,
-                fenceData.box_offset.x,
-                fenceData.box_offset.y,
-                local_height + 1);
+                session, image_id, fenceData.offset.x, fenceData.offset.y, fenceData.box_size.x, fenceData.box_size.y, 9,
+                local_height, fenceData.box_offset.x, fenceData.box_offset.y, local_height + 1);
         }
     }
 
@@ -1599,8 +1546,7 @@ void surface_paint(paint_session* session, uint8_t direction, uint16_t height, c
                 session,
                 SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0
                     | SEGMENT_D4,
-                height,
-                0);
+                height, 0);
             paint_util_force_set_general_support_height(session, height, 0);
             break;
 
diff --git a/src/openrct2/paint/tile_element/Paint.TileElement.cpp b/src/openrct2/paint/tile_element/Paint.TileElement.cpp
index b974e1a74f..85f1e36159 100644
--- a/src/openrct2/paint/tile_element/Paint.TileElement.cpp
+++ b/src/openrct2/paint/tile_element/Paint.TileElement.cpp
@@ -371,16 +371,7 @@ static void sub_68B3FB(paint_session* session, int32_t x, int32_t y)
             int32_t xOffset = sy * 10;
             int32_t yOffset = -22 + sx * 10;
             paint_struct* ps = sub_98197C(
-                session,
-                5504 | imageColourFlats,
-                xOffset,
-                yOffset,
-                10,
-                10,
-                1,
-                segmentHeight,
-                xOffset + 1,
-                yOffset + 16,
+                session, 5504 | imageColourFlats, xOffset, yOffset, 10, 10, 1, segmentHeight, xOffset + 1, yOffset + 16,
                 segmentHeight);
             if (ps != nullptr)
             {
diff --git a/src/openrct2/paint/tile_element/Paint.Wall.cpp b/src/openrct2/paint/tile_element/Paint.Wall.cpp
index dd05ff5f34..2738dd9b9b 100644
--- a/src/openrct2/paint/tile_element/Paint.Wall.cpp
+++ b/src/openrct2/paint/tile_element/Paint.Wall.cpp
@@ -40,19 +40,9 @@ static constexpr const uint8_t byte_9A40CC[] = {
 };
 
 static void fence_paint_door(
-    paint_session* session,
-    uint32_t imageId,
-    rct_scenery_entry* sceneryEntry,
-    uint32_t imageColourFlags,
-    uint32_t tertiaryColour,
-    uint32_t dword_141F710,
-    LocationXYZ16 offset,
-    LocationXYZ16 boundsR1,
-    LocationXYZ16 boundsR1_,
-    LocationXYZ16 boundsR2,
-    LocationXYZ16 boundsR2_,
-    LocationXYZ16 boundsL1,
-    LocationXYZ16 boundsL1_)
+    paint_session* session, uint32_t imageId, rct_scenery_entry* sceneryEntry, uint32_t imageColourFlags,
+    uint32_t tertiaryColour, uint32_t dword_141F710, LocationXYZ16 offset, LocationXYZ16 boundsR1, LocationXYZ16 boundsR1_,
+    LocationXYZ16 boundsR2, LocationXYZ16 boundsR2_, LocationXYZ16 boundsL1, LocationXYZ16 boundsL1_)
 {
     if (sceneryEntry->wall.flags & WALL_SCENERY_HAS_PRIMARY_COLOUR)
     {
@@ -69,34 +59,16 @@ static void fence_paint_door(
         paint_struct* ps;
 
         ps = sub_98197C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            boundsR1.x,
-            boundsR1.y,
-            (int8_t)boundsR1.z,
-            offset.z,
-            boundsR1_.x,
-            boundsR1_.y,
-            boundsR1_.z);
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, boundsR1.x, boundsR1.y, (int8_t)boundsR1.z, offset.z,
+            boundsR1_.x, boundsR1_.y, boundsR1_.z);
         if (ps != nullptr)
         {
             ps->tertiary_colour = tertiaryColour;
         }
 
         ps = sub_98197C(
-            session,
-            imageId + 1,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            boundsR2.x,
-            boundsR2.y,
-            (int8_t)boundsR2.z,
-            offset.z,
-            boundsR2_.x,
-            boundsR2_.y,
-            boundsR2_.z);
+            session, imageId + 1, (int8_t)offset.x, (int8_t)offset.y, boundsR2.x, boundsR2.y, (int8_t)boundsR2.z, offset.z,
+            boundsR2_.x, boundsR2_.y, boundsR2_.z);
         if (ps != nullptr)
         {
             ps->tertiary_colour = tertiaryColour;
@@ -107,34 +79,16 @@ static void fence_paint_door(
         paint_struct* ps;
 
         ps = sub_98197C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            boundsL1.x,
-            boundsL1.y,
-            (int8_t)boundsL1.z,
-            offset.z,
-            boundsL1_.x,
-            boundsL1_.y,
-            boundsL1_.z);
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, boundsL1.x, boundsL1.y, (int8_t)boundsL1.z, offset.z,
+            boundsL1_.x, boundsL1_.y, boundsL1_.z);
         if (ps != nullptr)
         {
             ps->tertiary_colour = tertiaryColour;
         }
 
         ps = sub_98199C(
-            session,
-            imageId + 1,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            boundsL1.x,
-            boundsL1.y,
-            (int8_t)boundsL1.z,
-            offset.z,
-            boundsL1_.x,
-            boundsL1_.y,
-            boundsL1_.z);
+            session, imageId + 1, (int8_t)offset.x, (int8_t)offset.y, boundsL1.x, boundsL1.y, (int8_t)boundsL1.z, offset.z,
+            boundsL1_.x, boundsL1_.y, boundsL1_.z);
         if (ps != nullptr)
         {
             ps->tertiary_colour = tertiaryColour;
@@ -143,17 +97,9 @@ static void fence_paint_door(
 }
 
 static void fence_paint_wall(
-    paint_session* session,
-    uint32_t frameNum,
-    const rct_scenery_entry* sceneryEntry,
-    uint32_t dword_141F710,
-    uint32_t imageColourFlags,
-    uint32_t dword_141F718,
-    uint32_t tertiaryColour,
-    uint32_t imageOffset,
-    LocationXYZ16 offset,
-    LocationXYZ16 bounds,
-    LocationXYZ16 boundsOffset)
+    paint_session* session, uint32_t frameNum, const rct_scenery_entry* sceneryEntry, uint32_t dword_141F710,
+    uint32_t imageColourFlags, uint32_t dword_141F718, uint32_t tertiaryColour, uint32_t imageOffset, LocationXYZ16 offset,
+    LocationXYZ16 bounds, LocationXYZ16 boundsOffset)
 {
     uint32_t baseImageId = sceneryEntry->image + imageOffset + frameNum;
     uint32_t imageId = baseImageId;
@@ -171,32 +117,14 @@ static void fence_paint_wall(
         }
 
         sub_98197C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            bounds.x,
-            bounds.y,
-            (int8_t)bounds.z,
-            offset.z,
-            boundsOffset.x,
-            boundsOffset.y,
-            boundsOffset.z);
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, bounds.x, bounds.y, (int8_t)bounds.z, offset.z,
+            boundsOffset.x, boundsOffset.y, boundsOffset.z);
         if (dword_141F710 == 0)
         {
             imageId = baseImageId + dword_141F718;
             sub_98199C(
-                session,
-                imageId,
-                (int8_t)offset.x,
-                (int8_t)offset.y,
-                bounds.x,
-                bounds.y,
-                (int8_t)bounds.z,
-                offset.z,
-                boundsOffset.x,
-                boundsOffset.y,
-                boundsOffset.z);
+                session, imageId, (int8_t)offset.x, (int8_t)offset.y, bounds.x, bounds.y, (int8_t)bounds.z, offset.z,
+                boundsOffset.x, boundsOffset.y, boundsOffset.z);
         }
     }
     else
@@ -212,17 +140,8 @@ static void fence_paint_wall(
         }
 
         paint_struct* paint = sub_98197C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            bounds.x,
-            bounds.y,
-            (int8_t)bounds.z,
-            offset.z,
-            boundsOffset.x,
-            boundsOffset.y,
-            boundsOffset.z);
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, bounds.x, bounds.y, (int8_t)bounds.z, offset.z,
+            boundsOffset.x, boundsOffset.y, boundsOffset.z);
         if (paint != nullptr)
         {
             paint->tertiary_colour = tertiaryColour;
@@ -313,19 +232,8 @@ void fence_paint(paint_session* session, uint8_t direction, int32_t height, cons
                 offset = { 0, 0, static_cast<int16_t>(height) };
 
                 fence_paint_door(
-                    session,
-                    imageId,
-                    sceneryEntry,
-                    imageColourFlags,
-                    tertiaryColour,
-                    dword_141F710,
-                    offset,
-                    boundsR1,
-                    boundsR1_,
-                    boundsR2,
-                    boundsR2_,
-                    boundsL1,
-                    boundsL1_);
+                    session, imageId, sceneryEntry, imageColourFlags, tertiaryColour, dword_141F710, offset, boundsR1,
+                    boundsR1_, boundsR2, boundsR2_, boundsL1, boundsL1_);
                 break;
 
             case 1:
@@ -342,19 +250,8 @@ void fence_paint(paint_session* session, uint8_t direction, int32_t height, cons
                 offset = { 1, 31, static_cast<int16_t>(height) };
 
                 fence_paint_door(
-                    session,
-                    imageId,
-                    sceneryEntry,
-                    imageColourFlags,
-                    tertiaryColour,
-                    dword_141F710,
-                    offset,
-                    boundsR1,
-                    boundsR1_,
-                    boundsR2,
-                    boundsR2_,
-                    boundsL1,
-                    boundsL1_);
+                    session, imageId, sceneryEntry, imageColourFlags, tertiaryColour, dword_141F710, offset, boundsR1,
+                    boundsR1_, boundsR2, boundsR2_, boundsL1, boundsL1_);
                 break;
 
             case 2:
@@ -371,19 +268,8 @@ void fence_paint(paint_session* session, uint8_t direction, int32_t height, cons
                 offset = { 31, 0, static_cast<int16_t>(height) };
 
                 fence_paint_door(
-                    session,
-                    imageId,
-                    sceneryEntry,
-                    imageColourFlags,
-                    tertiaryColour,
-                    dword_141F710,
-                    offset,
-                    boundsR1,
-                    boundsR1_,
-                    boundsR2,
-                    boundsR2_,
-                    boundsL1,
-                    boundsL1_);
+                    session, imageId, sceneryEntry, imageColourFlags, tertiaryColour, dword_141F710, offset, boundsR1,
+                    boundsR1_, boundsR2, boundsR2_, boundsL1, boundsL1_);
                 break;
 
             case 3:
@@ -400,19 +286,8 @@ void fence_paint(paint_session* session, uint8_t direction, int32_t height, cons
                 offset = { 2, 1, static_cast<int16_t>(height) };
 
                 fence_paint_door(
-                    session,
-                    imageId,
-                    sceneryEntry,
-                    imageColourFlags,
-                    tertiaryColour,
-                    dword_141F710,
-                    offset,
-                    boundsR1,
-                    boundsR1_,
-                    boundsR2,
-                    boundsR2_,
-                    boundsL1,
-                    boundsL1_);
+                    session, imageId, sceneryEntry, imageColourFlags, tertiaryColour, dword_141F710, offset, boundsR1,
+                    boundsR1_, boundsR2, boundsR2_, boundsL1, boundsL1_);
                 break;
         }
 
@@ -522,17 +397,8 @@ void fence_paint(paint_session* session, uint8_t direction, int32_t height, cons
     }
 
     fence_paint_wall(
-        session,
-        frameNum,
-        sceneryEntry,
-        dword_141F710,
-        imageColourFlags,
-        dword_141F718,
-        tertiaryColour,
-        imageOffset,
-        offset,
-        bounds,
-        boundsOffset);
+        session, frameNum, sceneryEntry, dword_141F710, imageColourFlags, dword_141F718, tertiaryColour, imageOffset, offset,
+        bounds, boundsOffset);
 
     if (sceneryEntry->wall.scrolling_mode == 0xFF)
     {
@@ -591,15 +457,6 @@ void fence_paint(paint_session* session, uint8_t direction, int32_t height, cons
     uint16_t scroll = (gCurrentTicks / 2) % string_width;
 
     sub_98199C(
-        session,
-        scrolling_text_setup(session, stringId, scroll, scrollingMode),
-        0,
-        0,
-        1,
-        1,
-        13,
-        height + 8,
-        boundsOffset.x,
-        boundsOffset.y,
-        boundsOffset.z);
+        session, scrolling_text_setup(session, stringId, scroll, scrollingMode), 0, 0, 1, 1, 13, height + 8, boundsOffset.x,
+        boundsOffset.y, boundsOffset.z);
 }
diff --git a/src/openrct2/peep/GuestPathfinding.cpp b/src/openrct2/peep/GuestPathfinding.cpp
index 42b08ba94d..0ff042a627 100644
--- a/src/openrct2/peep/GuestPathfinding.cpp
+++ b/src/openrct2/peep/GuestPathfinding.cpp
@@ -275,10 +275,7 @@ static uint8_t footpath_element_next_in_direction(TileCoordsXYZ loc, rct_tile_el
  * This is the recursive portion of footpath_element_destination_in_direction().
  */
 static uint8_t footpath_element_dest_in_dir(
-    TileCoordsXYZ loc,
-    [[maybe_unused]] rct_tile_element* inputTileElement,
-    uint8_t chosenDirection,
-    uint8_t* outRideIndex,
+    TileCoordsXYZ loc, [[maybe_unused]] rct_tile_element* inputTileElement, uint8_t chosenDirection, uint8_t* outRideIndex,
     int32_t level)
 {
     rct_tile_element* tileElement;
@@ -585,18 +582,9 @@ static bool path_is_thin_junction(rct_tile_element* path, TileCoordsXYZ loc)
  *  rct2: 0x0069A997
  */
 static void peep_pathfind_heuristic_search(
-    TileCoordsXYZ loc,
-    rct_peep* peep,
-    rct_tile_element* currentTileElement,
-    bool inPatrolArea,
-    uint8_t counter,
-    uint16_t* endScore,
-    int32_t test_edge,
-    uint8_t* endJunctions,
-    TileCoordsXYZ junctionList[16],
-    uint8_t directionList[16],
-    TileCoordsXYZ* endXYZ,
-    uint8_t* endSteps)
+    TileCoordsXYZ loc, rct_peep* peep, rct_tile_element* currentTileElement, bool inPatrolArea, uint8_t counter,
+    uint16_t* endScore, int32_t test_edge, uint8_t* endJunctions, TileCoordsXYZ junctionList[16], uint8_t directionList[16],
+    TileCoordsXYZ* endXYZ, uint8_t* endSteps)
 {
     uint8_t searchResult = PATH_SEARCH_FAILED;
 
@@ -787,11 +775,7 @@ static void peep_pathfind_heuristic_search(
         if (gPathFindDebug)
         {
             log_info(
-                "[%03d] Checking map element at %d,%d,%d; Type: %s",
-                counter,
-                x >> 5,
-                y >> 5,
-                z,
+                "[%03d] Checking map element at %d,%d,%d; Type: %s", counter, x >> 5, y >> 5, z,
                 gPathFindSearchText[searchResult]);
         }
 #endif // defined(DEBUG_LEVEL_2) && DEBUG_LEVEL_2
@@ -914,16 +898,8 @@ static void peep_pathfind_heuristic_search(
         if (gPathFindDebug)
         {
             log_info(
-                "[%03d] Path element at %d,%d,%d; Edges (0123):%d%d%d%d; Reverse: %d",
-                counter,
-                x >> 5,
-                y >> 5,
-                z,
-                edges & 1,
-                (edges & 2) >> 1,
-                (edges & 4) >> 2,
-                (edges & 8) >> 3,
-                test_edge ^ 2);
+                "[%03d] Path element at %d,%d,%d; Edges (0123):%d%d%d%d; Reverse: %d", counter, x >> 5, y >> 5, z, edges & 1,
+                (edges & 2) >> 1, (edges & 4) >> 2, (edges & 8) >> 3, test_edge ^ 2);
         }
 #endif // defined(DEBUG_LEVEL_2) && DEBUG_LEVEL_2
 
@@ -975,11 +951,7 @@ static void peep_pathfind_heuristic_search(
             if (gPathFindDebug)
             {
                 log_info(
-                    "[%03d] Search path ends at %d,%d,%d; Search limit reached; Score: %d",
-                    counter,
-                    x >> 5,
-                    y >> 5,
-                    z,
+                    "[%03d] Search path ends at %d,%d,%d; Search limit reached; Score: %d", counter, x >> 5, y >> 5, z,
                     new_score);
             }
 #endif // defined(DEBUG_LEVEL_2) && DEBUG_LEVEL_2
@@ -1089,11 +1061,7 @@ static void peep_pathfind_heuristic_search(
                     if (gPathFindDebug)
                     {
                         log_info(
-                            "[%03d] Search path ends at %d,%d,%d; NumJunctions < 0; Score: %d",
-                            counter,
-                            x >> 5,
-                            y >> 5,
-                            z,
+                            "[%03d] Search path ends at %d,%d,%d; NumJunctions < 0; Score: %d", counter, x >> 5, y >> 5, z,
                             new_score);
                     }
 #endif // defined(DEBUG_LEVEL_2) && DEBUG_LEVEL_2
@@ -1149,18 +1117,8 @@ static void peep_pathfind_heuristic_search(
             }
 
             peep_pathfind_heuristic_search(
-                { loc.x, loc.y, height },
-                peep,
-                tileElement,
-                nextInPatrolArea,
-                counter,
-                endScore,
-                next_test_edge,
-                endJunctions,
-                junctionList,
-                directionList,
-                endXYZ,
-                endSteps);
+                { loc.x, loc.y, height }, peep, tileElement, nextInPatrolArea, counter, endScore, next_test_edge, endJunctions,
+                junctionList, directionList, endXYZ, endSteps);
             _peepPathFindNumJunctions = savedNumJunctions;
 
 #if defined(DEBUG_LEVEL_2) && DEBUG_LEVEL_2
@@ -1220,14 +1178,8 @@ int32_t peep_pathfind_choose_direction(TileCoordsXYZ loc, rct_peep* peep)
     if (gPathFindDebug)
     {
         log_verbose(
-            "Choose direction for %s for goal %d,%d,%d from %d,%d,%d",
-            gPathFindDebugPeepName,
-            goal.x,
-            goal.y,
-            goal.z,
-            loc.x,
-            loc.y,
-            loc.z);
+            "Choose direction for %s for goal %d,%d,%d from %d,%d,%d", gPathFindDebugPeepName, goal.x, goal.y, goal.z, loc.x,
+            loc.y, loc.z);
     }
 #endif // defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1
 
@@ -1317,14 +1269,8 @@ int32_t peep_pathfind_choose_direction(TileCoordsXYZ loc, rct_peep* peep)
                 if (gPathFindDebug)
                 {
                     log_verbose(
-                        "Getting untried edges from pf_history for %d,%d,%d:  %s,%s,%s,%s",
-                        loc.x,
-                        loc.y,
-                        loc.z,
-                        (edges & 1) ? "0" : "-",
-                        (edges & 2) ? "1" : "-",
-                        (edges & 4) ? "2" : "-",
-                        (edges & 8) ? "3" : "-");
+                        "Getting untried edges from pf_history for %d,%d,%d:  %s,%s,%s,%s", loc.x, loc.y, loc.z,
+                        (edges & 1) ? "0" : "-", (edges & 2) ? "1" : "-", (edges & 4) ? "2" : "-", (edges & 8) ? "3" : "-");
                 }
 #endif // defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1
 
@@ -1469,40 +1415,20 @@ int32_t peep_pathfind_choose_direction(TileCoordsXYZ loc, rct_peep* peep)
 #endif // defined(DEBUG_LEVEL_2) && DEBUG_LEVEL_2
 
             peep_pathfind_heuristic_search(
-                { loc.x, loc.y, height },
-                peep,
-                first_tile_element,
-                inPatrolArea,
-                0,
-                &score,
-                test_edge,
-                &endJunctions,
-                endJunctionList,
-                endDirectionList,
-                &endXYZ,
-                &endSteps);
+                { loc.x, loc.y, height }, peep, first_tile_element, inPatrolArea, 0, &score, test_edge, &endJunctions,
+                endJunctionList, endDirectionList, &endXYZ, &endSteps);
 
 #if defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1
             if (gPathFindDebug)
             {
                 log_verbose(
-                    "Pathfind test edge: %d score: %d steps: %d end: %d,%d,%d junctions: %d",
-                    test_edge,
-                    score,
-                    endSteps,
-                    endXYZ.x,
-                    endXYZ.y,
-                    endXYZ.z,
-                    endJunctions);
+                    "Pathfind test edge: %d score: %d steps: %d end: %d,%d,%d junctions: %d", test_edge, score, endSteps,
+                    endXYZ.x, endXYZ.y, endXYZ.z, endJunctions);
                 for (uint8_t listIdx = 0; listIdx < endJunctions; listIdx++)
                 {
                     log_info(
-                        "Junction#%d %d,%d,%d Direction %d",
-                        listIdx + 1,
-                        endJunctionList[listIdx].x,
-                        endJunctionList[listIdx].y,
-                        endJunctionList[listIdx].z,
-                        endDirectionList[listIdx]);
+                        "Junction#%d %d,%d,%d Direction %d", listIdx + 1, endJunctionList[listIdx].x,
+                        endJunctionList[listIdx].y, endJunctionList[listIdx].z, endDirectionList[listIdx]);
                 }
             }
 #endif // defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1
@@ -1548,12 +1474,8 @@ int32_t peep_pathfind_choose_direction(TileCoordsXYZ loc, rct_peep* peep)
             for (uint8_t listIdx = 0; listIdx < bestJunctions; listIdx++)
             {
                 log_verbose(
-                    "Junction#%d %d,%d,%d Direction %d",
-                    listIdx + 1,
-                    bestJunctionList[listIdx].x,
-                    bestJunctionList[listIdx].y,
-                    bestJunctionList[listIdx].z,
-                    bestDirectionList[listIdx]);
+                    "Junction#%d %d,%d,%d Direction %d", listIdx + 1, bestJunctionList[listIdx].x, bestJunctionList[listIdx].y,
+                    bestJunctionList[listIdx].z, bestDirectionList[listIdx]);
             }
             log_verbose("End at %d,%d,%d", bestXYZ.x, bestXYZ.y, bestXYZ.z);
         }
@@ -1577,13 +1499,8 @@ int32_t peep_pathfind_choose_direction(TileCoordsXYZ loc, rct_peep* peep)
                 if (gPathFindDebug)
                 {
                     log_verbose(
-                        "Updating existing pf_history (in index: %d) for %d,%d,%d without entry edge %d & exit edge %d.",
-                        i,
-                        loc.x,
-                        loc.y,
-                        loc.z,
-                        peep->direction ^ 2,
-                        chosen_edge);
+                        "Updating existing pf_history (in index: %d) for %d,%d,%d without entry edge %d & exit edge %d.", i,
+                        loc.x, loc.y, loc.z, peep->direction ^ 2, chosen_edge);
                 }
 #endif // defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1
                 return chosen_edge;
@@ -1607,13 +1524,8 @@ int32_t peep_pathfind_choose_direction(TileCoordsXYZ loc, rct_peep* peep)
         if (gPathFindDebug)
         {
             log_verbose(
-                "Storing new pf_history (in index: %d) for %d,%d,%d without entry edge %d & exit edge %d.",
-                i,
-                loc.x,
-                loc.y,
-                loc.z,
-                peep->direction ^ 2,
-                chosen_edge);
+                "Storing new pf_history (in index: %d) for %d,%d,%d without entry edge %d & exit edge %d.", i, loc.x, loc.y,
+                loc.z, peep->direction ^ 2, chosen_edge);
         }
 #endif // defined(DEBUG_LEVEL_1) && DEBUG_LEVEL_1
     }
@@ -2027,8 +1939,7 @@ int32_t guest_path_finding(rct_peep* peep)
         if (gPathFindDebug)
         {
             log_info(
-                "Completed guest_path_finding for %s - taking only direction available: %d.",
-                gPathFindDebugPeepName,
+                "Completed guest_path_finding for %s - taking only direction available: %d.", gPathFindDebugPeepName,
                 direction);
         }
         pathfind_logging_disable();
diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp
index 516870a9f4..45b700d928 100644
--- a/src/openrct2/peep/Peep.cpp
+++ b/src/openrct2/peep/Peep.cpp
@@ -524,8 +524,7 @@ uint8_t rct_peep::GetActionSpriteType()
     else
     {
         openrct2_assert(
-            action >= Util::CountOf(PeepActionToSpriteTypeMap) && action < PEEP_ACTION_NONE_1,
-            "Invalid peep action %u",
+            action >= Util::CountOf(PeepActionToSpriteTypeMap) && action < PEEP_ACTION_NONE_1, "Invalid peep action %u",
             action);
         return 0;
     }
diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp
index d4aac0a840..2aff1739c5 100644
--- a/src/openrct2/peep/Staff.cpp
+++ b/src/openrct2/peep/Staff.cpp
@@ -169,12 +169,7 @@ static inline void staff_autoposition_new_staff_member(rct_peep* newPeep)
 }
 
 static money32 staff_hire_new_staff_member(
-    uint8_t staff_type,
-    uint8_t flags,
-    int16_t command_x,
-    int16_t command_y,
-    int16_t command_z,
-    int32_t autoposition,
+    uint8_t staff_type, uint8_t flags, int16_t command_x, int16_t command_y, int16_t command_z, int32_t autoposition,
     int32_t* newPeep_sprite_index)
 {
     gCommandExpenditureType = RCT_EXPENDITURE_TYPE_WAGES;
@@ -372,12 +367,7 @@ static money32 staff_hire_new_staff_member(
  *  rct2: 0x006BEFA1
  */
 void game_command_hire_new_staff_member(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     *ebx = staff_hire_new_staff_member(
@@ -409,13 +399,8 @@ static constexpr const bool peep_slow_walking_types[] = {
  *  rct2: 0x006C0BB5
  */
 void game_command_set_staff_order(
-    [[maybe_unused]] int32_t* eax,
-    int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, int32_t* ebx, [[maybe_unused]] int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi,
+    [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     gCommandExpenditureType = RCT_EXPENDITURE_TYPE_WAGES;
     uint8_t order_id = *ebx >> 8;
@@ -466,12 +451,7 @@ void game_command_set_staff_order(
  *  rct2: 0x006C09D1
  */
 void game_command_set_staff_patrol(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     if (*ebx & GAME_COMMAND_FLAG_APPLY)
@@ -526,13 +506,8 @@ void game_command_set_staff_patrol(
  *  rct2: 0x006C0B83
  */
 void game_command_fire_staff_member(
-    [[maybe_unused]] int32_t* eax,
-    int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, int32_t* ebx, [[maybe_unused]] int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi,
+    [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     gCommandExpenditureType = RCT_EXPENDITURE_TYPE_WAGES;
     if (*ebx & GAME_COMMAND_FLAG_APPLY)
@@ -590,13 +565,8 @@ uint16_t hire_new_staff_member(uint8_t staffType)
         rct_peep* newPeep = GET_PEEP(new_sprite_index);
         uint8_t new_orders = newPeep->staff_orders | STAFF_ORDERS_MOWING;
         game_do_command(
-            newPeep->x,
-            ((int32_t)new_orders << 8) | GAME_COMMAND_FLAG_APPLY,
-            newPeep->y,
-            new_sprite_index,
-            GAME_COMMAND_SET_STAFF_ORDER,
-            0,
-            0);
+            newPeep->x, ((int32_t)new_orders << 8) | GAME_COMMAND_FLAG_APPLY, newPeep->y, new_sprite_index,
+            GAME_COMMAND_SET_STAFF_ORDER, 0, 0);
     }
 
     return new_sprite_index;
diff --git a/src/openrct2/platform/Crash.cpp b/src/openrct2/platform/Crash.cpp
index 98e439e2cf..624325e18a 100644
--- a/src/openrct2/platform/Crash.cpp
+++ b/src/openrct2/platform/Crash.cpp
@@ -40,12 +40,8 @@ const wchar_t* _wszCommitSha1Short = WSZ("");
 const wchar_t* _wszArchitecture = WSZ(OPENRCT2_ARCHITECTURE);
 
 static bool OnCrash(
-    const wchar_t* dumpPath,
-    const wchar_t* miniDumpId,
-    void* context,
-    EXCEPTION_POINTERS* exinfo,
-    MDRawAssertionInfo* assertion,
-    bool succeeded)
+    const wchar_t* dumpPath, const wchar_t* miniDumpId, void* context, EXCEPTION_POINTERS* exinfo,
+    MDRawAssertionInfo* assertion, bool succeeded)
 {
     if (!succeeded)
     {
@@ -69,12 +65,7 @@ static bool OnCrash(
     // Try to rename the files
     wchar_t dumpFilePathNew[MAX_PATH];
     swprintf_s(
-        dumpFilePathNew,
-        sizeof(dumpFilePathNew),
-        L"%s%s(%s_%s).dmp",
-        dumpPath,
-        miniDumpId,
-        _wszCommitSha1Short,
+        dumpFilePathNew, sizeof(dumpFilePathNew), L"%s%s(%s_%s).dmp", dumpPath, miniDumpId, _wszCommitSha1Short,
         _wszArchitecture);
     if (_wrename(dumpFilePath, dumpFilePathNew) == 0)
     {
diff --git a/src/openrct2/platform/Windows.cpp b/src/openrct2/platform/Windows.cpp
index 95ae0cfc57..46c3527e35 100644
--- a/src/openrct2/platform/Windows.cpp
+++ b/src/openrct2/platform/Windows.cpp
@@ -391,11 +391,7 @@ uint8_t platform_get_locale_date_format()
     wchar_t first[sizeof(dateFormat)];
     wchar_t second[sizeof(dateFormat)];
     if (swscanf_s(
-            dateFormat,
-            L"%l[dyM]%*l[^dyM]%l[dyM]%*l[^dyM]%*l[dyM]",
-            first,
-            (uint32_t)Util::CountOf(first),
-            second,
+            dateFormat, L"%l[dyM]%*l[^dyM]%l[dyM]%*l[^dyM]%*l[dyM]", first, (uint32_t)Util::CountOf(first), second,
             (uint32_t)Util::CountOf(second))
         != 2)
     {
diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp
index 45c07a2038..8e2a906e1b 100644
--- a/src/openrct2/rct1/S4Importer.cpp
+++ b/src/openrct2/rct1/S4Importer.cpp
@@ -1758,9 +1758,8 @@ private:
     {
         for (size_t i = 0; i < RCT12_MAX_PEEP_SPAWNS; i++)
         {
-            gPeepSpawns[i] = {
-                _s4.peep_spawn[i].x, _s4.peep_spawn[i].y, _s4.peep_spawn[i].z * 16, _s4.peep_spawn[i].direction
-            };
+            gPeepSpawns[i] = { _s4.peep_spawn[i].x, _s4.peep_spawn[i].y, _s4.peep_spawn[i].z * 16,
+                               _s4.peep_spawn[i].direction };
         }
 
         for (size_t i = RCT12_MAX_PEEP_SPAWNS; i < MAX_PEEP_SPAWNS; i++)
@@ -1911,8 +1910,7 @@ private:
         AppendRequiredObjects(result, OBJECT_TYPE_PATH_BITS, _pathAdditionEntries);
         AppendRequiredObjects(result, OBJECT_TYPE_SCENERY_GROUP, _sceneryGroupEntries);
         AppendRequiredObjects(
-            result,
-            OBJECT_TYPE_BANNERS,
+            result, OBJECT_TYPE_BANNERS,
             std::vector<const char*>({
                 "BN1     ",
                 "BN2     ",
diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp
index cdcd98b7a5..8570dcf496 100644
--- a/src/openrct2/rct2/S6Exporter.cpp
+++ b/src/openrct2/rct2/S6Exporter.cpp
@@ -426,9 +426,8 @@ void S6Exporter::ExportPeepSpawns()
 {
     for (size_t i = 0; i < RCT12_MAX_PEEP_SPAWNS; i++)
     {
-        _s6.peep_spawns[i] = {
-            (uint16_t)gPeepSpawns[i].x, (uint16_t)gPeepSpawns[i].y, (uint8_t)(gPeepSpawns[i].z / 16), gPeepSpawns[i].direction
-        };
+        _s6.peep_spawns[i] = { (uint16_t)gPeepSpawns[i].x, (uint16_t)gPeepSpawns[i].y, (uint8_t)(gPeepSpawns[i].z / 16),
+                               gPeepSpawns[i].direction };
     }
 }
 
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index 7adecd5ec3..218c25d9f7 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -104,9 +104,7 @@ public:
     }
 
     ParkLoadResult LoadFromStream(
-        IStream* stream,
-        bool isScenario,
-        [[maybe_unused]] bool skipObjectCheck = false,
+        IStream* stream, bool isScenario, [[maybe_unused]] bool skipObjectCheck = false,
         const utf8* path = String::Empty) override
     {
         if (isScenario && !gConfigGeneral.allow_loading_with_incorrect_checksum && !SawyerEncoding::ValidateChecksum(stream))
@@ -805,9 +803,8 @@ public:
 
         for (size_t i = 0; i < RCT12_MAX_PEEP_SPAWNS; i++)
         {
-            gPeepSpawns[i] = {
-                _s6.peep_spawns[i].x, _s6.peep_spawns[i].y, _s6.peep_spawns[i].z * 16, _s6.peep_spawns[i].direction
-            };
+            gPeepSpawns[i] = { _s6.peep_spawns[i].x, _s6.peep_spawns[i].y, _s6.peep_spawns[i].z * 16,
+                               _s6.peep_spawns[i].direction };
         }
 
         for (size_t i = RCT12_MAX_PEEP_SPAWNS; i < MAX_PEEP_SPAWNS; i++)
diff --git a/src/openrct2/ride/CableLift.cpp b/src/openrct2/ride/CableLift.cpp
index 677b6bcabc..08f8371595 100644
--- a/src/openrct2/ride/CableLift.cpp
+++ b/src/openrct2/ride/CableLift.cpp
@@ -25,13 +25,7 @@ static void cable_lift_update_travelling(rct_vehicle* vehicle);
 static void cable_lift_update_arriving(rct_vehicle* vehicle);
 
 rct_vehicle* cable_lift_segment_create(
-    int32_t rideIndex,
-    int32_t x,
-    int32_t y,
-    int32_t z,
-    int32_t direction,
-    uint16_t var_44,
-    int32_t remaining_distance,
+    int32_t rideIndex, int32_t x, int32_t y, int32_t z, int32_t direction, uint16_t var_44, int32_t remaining_distance,
     bool head)
 {
     Ride* ride = get_ride(rideIndex);
diff --git a/src/openrct2/ride/CableLift.h b/src/openrct2/ride/CableLift.h
index c8462cf301..d0b0af3ca7 100644
--- a/src/openrct2/ride/CableLift.h
+++ b/src/openrct2/ride/CableLift.h
@@ -14,13 +14,7 @@
 #include "Vehicle.h"
 
 rct_vehicle* cable_lift_segment_create(
-    int32_t rideIndex,
-    int32_t x,
-    int32_t y,
-    int32_t z,
-    int32_t direction,
-    uint16_t var_44,
-    int32_t remaining_distance,
+    int32_t rideIndex, int32_t x, int32_t y, int32_t z, int32_t direction, uint16_t var_44, int32_t remaining_distance,
     bool head);
 void cable_lift_update(rct_vehicle* vehicle);
 int32_t cable_lift_update_track_motion(rct_vehicle* cableLift);
diff --git a/src/openrct2/ride/MusicList.cpp b/src/openrct2/ride/MusicList.cpp
index 5f4fb80096..6ca8d9a5b4 100644
--- a/src/openrct2/ride/MusicList.cpp
+++ b/src/openrct2/ride/MusicList.cpp
@@ -20,19 +20,9 @@
 std::vector<uint8_t> gRideMusicStyleTuneIds[] = {
     MAKE_TUNEID_LIST(TUNE_DODGEMS_BEAT), // MUSIC_STYLE_DODGEMS_BEAT
     MAKE_TUNEID_LIST(                    // MUSIC_STYLE_FAIRGROUND_ORGAN
-        TUNE_CHILDREN_OF_THE_REGIMENT,
-        TUNE_SERENADE_OP_21,
-        TUNE_IN_CONTINENTAL_MOOD,
-        TUNE_WEDDING_JOURNEY,
-        TUNE_TALES_FROM_THE_VIENNA_WOODS,
-        TUNE_SLAVONIC_DANCE,
-        TUNE_CSS_10,
-        TUNE_DAS_ALPENHORN,
-        TUNE_BELLA_BELLA_BIMBA,
-        TUNE_THE_BLOND_SAILOR,
-        TUNE_POET_AND_PEASANT_OVERTURE,
-        TUNE_WALTZ_MEDLEY,
-        TUNE_CSS_16),
+        TUNE_CHILDREN_OF_THE_REGIMENT, TUNE_SERENADE_OP_21, TUNE_IN_CONTINENTAL_MOOD, TUNE_WEDDING_JOURNEY,
+        TUNE_TALES_FROM_THE_VIENNA_WOODS, TUNE_SLAVONIC_DANCE, TUNE_CSS_10, TUNE_DAS_ALPENHORN, TUNE_BELLA_BELLA_BIMBA,
+        TUNE_THE_BLOND_SAILOR, TUNE_POET_AND_PEASANT_OVERTURE, TUNE_WALTZ_MEDLEY, TUNE_CSS_16),
     MAKE_TUNEID_LIST(TUNE_CAESARS_MARCH),                            // MUSIC_STYLE_ROMAN_FANFARE
     MAKE_TUNEID_LIST(TUNE_NINJAS_NOODLES),                           // MUSIC_STYLE_ORIENTAL
     MAKE_TUNEID_LIST(TUNE_INVADERS),                                 // MUSIC_STYLE_MARTIAN
diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index b37369f37f..41891beaf2 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -532,15 +532,8 @@ bool ride_try_get_origin_element(int32_t rideIndex, CoordsXYE* output)
  * on the first element of a track block
  */
 bool track_block_get_next_from_zero(
-    int16_t x,
-    int16_t y,
-    int16_t z_start,
-    uint8_t rideIndex,
-    uint8_t direction_start,
-    CoordsXYE* output,
-    int32_t* z,
-    int32_t* direction,
-    bool isGhost)
+    int16_t x, int16_t y, int16_t z_start, uint8_t rideIndex, uint8_t direction_start, CoordsXYE* output, int32_t* z,
+    int32_t* direction, bool isGhost)
 {
     Ride* ride = get_ride(rideIndex);
 
@@ -1277,14 +1270,8 @@ void ride_clear_blocked_tiles(int32_t rideIndex)
  * bp : flags
  */
 int32_t sub_6C683D(
-    int32_t* x,
-    int32_t* y,
-    int32_t* z,
-    int32_t direction,
-    int32_t type,
-    uint16_t extra_params,
-    rct_tile_element** output_element,
-    uint16_t flags)
+    int32_t* x, int32_t* y, int32_t* z, int32_t direction, int32_t type, uint16_t extra_params,
+    rct_tile_element** output_element, uint16_t flags)
 {
     rct_tile_element* tileElement = map_get_first_element_at(*x / 32, *y / 32);
     rct_tile_element* successTileElement = nullptr;
@@ -1488,13 +1475,8 @@ void ride_remove_provisional_track_piece()
             uint8_t trackType = track_element_get_type(next_track.element);
             int32_t trackSequence = tile_element_get_track_sequence(next_track.element);
             game_do_command(
-                next_track.x,
-                flags | ((direction & 3) << 8),
-                next_track.y,
-                trackType | (trackSequence << 8),
-                GAME_COMMAND_REMOVE_TRACK,
-                z,
-                0);
+                next_track.x, flags | ((direction & 3) << 8), next_track.y, trackType | (trackSequence << 8),
+                GAME_COMMAND_REMOVE_TRACK, z, 0);
         }
     }
 }
@@ -1936,13 +1918,8 @@ static int32_t ride_modify_entrance_or_exit(rct_tile_element* tileElement, int32
     {
         // Remove entrance / exit
         game_do_command(
-            x,
-            (GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_APPLY),
-            y,
-            rideIndex,
-            GAME_COMMAND_REMOVE_RIDE_ENTRANCE_OR_EXIT,
-            bl,
-            0);
+            x, (GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_APPLY), y, rideIndex,
+            GAME_COMMAND_REMOVE_RIDE_ENTRANCE_OR_EXIT, bl, 0);
         gCurrentToolWidget.widget_index = entranceType == ENTRANCE_TYPE_RIDE_ENTRANCE ? WC_RIDE_CONSTRUCTION__WIDX_ENTRANCE
                                                                                       : WC_RIDE_CONSTRUCTION__WIDX_EXIT;
         gRideEntranceExitPlaceType = entranceType;
@@ -3926,8 +3903,7 @@ void ride_music_update_final()
             } while (channel < AUDIO_MAX_RIDE_MUSIC);
 
             for (rct_ride_music_params* ride_music_params = &gRideMusicParamsList[0];
-                 ride_music_params < gRideMusicParamsListEnd;
-                 ride_music_params++)
+                 ride_music_params < gRideMusicParamsListEnd; ride_music_params++)
             {
                 if (ride_music_params->ride_id != RIDE_ID_NULL)
                 {
@@ -4236,13 +4212,8 @@ static money32 ride_set_setting(uint8_t rideIndex, uint8_t setting, uint8_t valu
  *  rct2: 0x006B5559
  */
 void game_command_set_ride_setting(
-    [[maybe_unused]] int32_t* eax,
-    int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, int32_t* ebx, [[maybe_unused]] int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi,
+    [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     uint8_t rideIndex = *edx & 0xFF;
     uint8_t setting = (*edx >> 8) & 0xFF;
@@ -4826,15 +4797,8 @@ static constexpr const LocationXY16 word_9A2A60[] = {
  *  rct2: 0x006DD90D
  */
 static rct_vehicle* vehicle_create_car(
-    int32_t rideIndex,
-    int32_t vehicleEntryIndex,
-    int32_t carIndex,
-    int32_t vehicleIndex,
-    int32_t x,
-    int32_t y,
-    int32_t z,
-    int32_t* remainingDistance,
-    rct_tile_element* tileElement)
+    int32_t rideIndex, int32_t vehicleEntryIndex, int32_t carIndex, int32_t vehicleIndex, int32_t x, int32_t y, int32_t z,
+    int32_t* remainingDistance, rct_tile_element* tileElement)
 {
     Ride* ride = get_ride(rideIndex);
     rct_ride_entry* rideEntry = get_ride_entry(ride->subtype);
@@ -5028,12 +4992,7 @@ static rct_vehicle* vehicle_create_car(
  *  rct2: 0x006DD84C
  */
 static train_ref vehicle_create_train(
-    int32_t rideIndex,
-    int32_t x,
-    int32_t y,
-    int32_t z,
-    int32_t vehicleIndex,
-    int32_t* remainingDistance,
+    int32_t rideIndex, int32_t x, int32_t y, int32_t z, int32_t vehicleIndex, int32_t* remainingDistance,
     rct_tile_element* tileElement)
 {
     Ride* ride = get_ride(rideIndex);
@@ -5996,13 +5955,9 @@ int32_t ride_get_refund_price(int32_t ride_id)
     do
     {
         addedcost = game_do_command(
-            trackElement.x,
-            GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | (direction << 8),
-            trackElement.y,
+            trackElement.x, GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | (direction << 8), trackElement.y,
             trackElement.element->properties.track.type | ((trackElement.element->properties.track.sequence & 0xF) << 8),
-            GAME_COMMAND_REMOVE_TRACK,
-            trackElement.element->base_height * 8,
-            0);
+            GAME_COMMAND_REMOVE_TRACK, trackElement.element->base_height * 8, 0);
 
         cost += (addedcost == MONEY32_UNDEFINED) ? 0 : addedcost;
 
@@ -6283,13 +6238,8 @@ rct_ride_name get_ride_naming(const uint8_t rideType, rct_ride_entry* rideEntry)
  */
 
 void game_command_callback_ride_construct_placed_back(
-    [[maybe_unused]] int32_t eax,
-    [[maybe_unused]] int32_t ebx,
-    [[maybe_unused]] int32_t ecx,
-    [[maybe_unused]] int32_t edx,
-    [[maybe_unused]] int32_t esi,
-    [[maybe_unused]] int32_t edi,
-    [[maybe_unused]] int32_t ebp)
+    [[maybe_unused]] int32_t eax, [[maybe_unused]] int32_t ebx, [[maybe_unused]] int32_t ecx, [[maybe_unused]] int32_t edx,
+    [[maybe_unused]] int32_t esi, [[maybe_unused]] int32_t edi, [[maybe_unused]] int32_t ebp)
 {
     int32_t trackDirection, x, y, z;
     track_begin_end trackBeginEnd;
@@ -6326,13 +6276,8 @@ void game_command_callback_ride_construct_placed_back(
 }
 
 void game_command_callback_ride_construct_placed_front(
-    [[maybe_unused]] int32_t eax,
-    [[maybe_unused]] int32_t ebx,
-    [[maybe_unused]] int32_t ecx,
-    [[maybe_unused]] int32_t edx,
-    [[maybe_unused]] int32_t esi,
-    [[maybe_unused]] int32_t edi,
-    [[maybe_unused]] int32_t ebp)
+    [[maybe_unused]] int32_t eax, [[maybe_unused]] int32_t ebx, [[maybe_unused]] int32_t ecx, [[maybe_unused]] int32_t edx,
+    [[maybe_unused]] int32_t esi, [[maybe_unused]] int32_t edi, [[maybe_unused]] int32_t ebp)
 {
     int32_t trackDirection, x, y, z;
 
@@ -6378,13 +6323,8 @@ void game_command_callback_ride_construct_placed_front(
  */
 
 void game_command_callback_ride_remove_track_piece(
-    [[maybe_unused]] int32_t eax,
-    [[maybe_unused]] int32_t ebx,
-    [[maybe_unused]] int32_t ecx,
-    [[maybe_unused]] int32_t edx,
-    [[maybe_unused]] int32_t esi,
-    [[maybe_unused]] int32_t edi,
-    [[maybe_unused]] int32_t ebp)
+    [[maybe_unused]] int32_t eax, [[maybe_unused]] int32_t ebx, [[maybe_unused]] int32_t ecx, [[maybe_unused]] int32_t edx,
+    [[maybe_unused]] int32_t esi, [[maybe_unused]] int32_t edi, [[maybe_unused]] int32_t ebp)
 {
     int32_t x, y, z, direction, type;
 
@@ -6402,13 +6342,8 @@ void game_command_callback_ride_remove_track_piece(
  *  rct2: 0x006B2FC5
  */
 void game_command_set_ride_appearance(
-    [[maybe_unused]] int32_t* eax,
-    int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, int32_t* ebx, [[maybe_unused]] int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi,
+    int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     bool apply = (*ebx & GAME_COMMAND_FLAG_APPLY);
 
@@ -6564,13 +6499,8 @@ void game_command_set_ride_appearance(
  *  rct2: 0x006B53E9
  */
 void game_command_set_ride_price(
-    [[maybe_unused]] int32_t* eax,
-    int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, int32_t* ebx, [[maybe_unused]] int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi,
+    int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     uint32_t flags = *ebx;
     uint8_t ride_number = (*edx & 0xFF);
@@ -7309,11 +7239,7 @@ bool ride_select_backwards_from_front()
 
     ride_construction_invalidate_current_track();
     if (track_block_get_previous_from_zero(
-            _currentTrackBeginX,
-            _currentTrackBeginY,
-            _currentTrackBeginZ,
-            _currentRideIndex,
-            _currentTrackPieceDirection,
+            _currentTrackBeginX, _currentTrackBeginY, _currentTrackBeginZ, _currentRideIndex, _currentTrackPieceDirection,
             &trackBeginEnd))
     {
         _rideConstructionState = RIDE_CONSTRUCTION_STATE_SELECTED;
@@ -7821,39 +7747,24 @@ void ride_set_ride_entry(int32_t rideIndex, int32_t rideEntry)
 {
     gGameCommandErrorTitle = STR_RIDE_SET_VEHICLE_TYPE_FAIL;
     game_do_command(
-        0,
-        GAME_COMMAND_FLAG_APPLY | (RIDE_SET_VEHICLES_COMMAND_TYPE_RIDE_ENTRY << 8),
-        0,
-        (rideEntry << 8) | rideIndex,
-        GAME_COMMAND_SET_RIDE_VEHICLES,
-        0,
-        0);
+        0, GAME_COMMAND_FLAG_APPLY | (RIDE_SET_VEHICLES_COMMAND_TYPE_RIDE_ENTRY << 8), 0, (rideEntry << 8) | rideIndex,
+        GAME_COMMAND_SET_RIDE_VEHICLES, 0, 0);
 }
 
 void ride_set_num_vehicles(int32_t rideIndex, int32_t numVehicles)
 {
     gGameCommandErrorTitle = STR_RIDE_SET_VEHICLE_SET_NUM_TRAINS_FAIL;
     game_do_command(
-        0,
-        GAME_COMMAND_FLAG_APPLY | (RIDE_SET_VEHICLES_COMMAND_TYPE_NUM_TRAINS << 8),
-        0,
-        (numVehicles << 8) | rideIndex,
-        GAME_COMMAND_SET_RIDE_VEHICLES,
-        0,
-        0);
+        0, GAME_COMMAND_FLAG_APPLY | (RIDE_SET_VEHICLES_COMMAND_TYPE_NUM_TRAINS << 8), 0, (numVehicles << 8) | rideIndex,
+        GAME_COMMAND_SET_RIDE_VEHICLES, 0, 0);
 }
 
 void ride_set_num_cars_per_vehicle(int32_t rideIndex, int32_t numCarsPerVehicle)
 {
     gGameCommandErrorTitle = STR_RIDE_SET_VEHICLE_SET_NUM_CARS_PER_TRAIN_FAIL;
     game_do_command(
-        0,
-        GAME_COMMAND_FLAG_APPLY | (RIDE_SET_VEHICLES_COMMAND_TYPE_NUM_CARS_PER_TRAIN << 8),
-        0,
-        (numCarsPerVehicle << 8) | rideIndex,
-        GAME_COMMAND_SET_RIDE_VEHICLES,
-        0,
-        0);
+        0, GAME_COMMAND_FLAG_APPLY | (RIDE_SET_VEHICLES_COMMAND_TYPE_NUM_CARS_PER_TRAIN << 8), 0,
+        (numCarsPerVehicle << 8) | rideIndex, GAME_COMMAND_SET_RIDE_VEHICLES, 0, 0);
 }
 
 static bool ride_is_vehicle_type_valid(Ride* ride, uint8_t inputRideEntryIndex)
@@ -8038,13 +7949,8 @@ static money32 ride_set_vehicles(uint8_t rideIndex, uint8_t setting, uint8_t val
  *  rct2: 0x006B52D4
  */
 void game_command_set_ride_vehicles(
-    int32_t* eax,
-    int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    int32_t* eax, int32_t* ebx, [[maybe_unused]] int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi,
+    [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     uint8_t rideIndex = *edx & 0xFF;
     uint8_t setting = (*ebx >> 8) & 0xFF;
@@ -8248,11 +8154,8 @@ void sub_6CB945(int32_t rideIndex)
                         break;
 
                     ride_set_exit_location(
-                        ride,
-                        stationId,
-                        { location.x / 32,
-                          location.y / 32,
-                          ride->station_heights[stationId],
+                        ride, stationId,
+                        { location.x / 32, location.y / 32, ride->station_heights[stationId],
                           (uint8_t)tile_element_get_direction(tileElement) });
                 }
                 else
@@ -8949,11 +8852,7 @@ void determine_ride_entrance_and_exit_locations()
 
                                 log_verbose(
                                     "Fixed disconnected entrance of ride %d, station %d to x = %d, y = %d and z = %d.",
-                                    rideIndex,
-                                    stationIndex,
-                                    x,
-                                    y,
-                                    tileElement->base_height);
+                                    rideIndex, stationIndex, x, y, tileElement->base_height);
                             }
                             else if (fixExit && tileElement->properties.entrance.type == ENTRANCE_TYPE_RIDE_EXIT)
                             {
@@ -8967,18 +8866,13 @@ void determine_ride_entrance_and_exit_locations()
 
                                 // Found our exit
                                 ride_set_exit_location(
-                                    ride,
-                                    stationIndex,
+                                    ride, stationIndex,
                                     { x, y, tileElement->base_height, (uint8_t)tile_element_get_direction(tileElement) });
                                 alreadyFoundExit = true;
 
                                 log_verbose(
-                                    "Fixed disconnected exit of ride %d, station %d to x = %d, y = %d and z = %d.",
-                                    rideIndex,
-                                    stationIndex,
-                                    x,
-                                    y,
-                                    tileElement->base_height);
+                                    "Fixed disconnected exit of ride %d, station %d to x = %d, y = %d and z = %d.", rideIndex,
+                                    stationIndex, x, y, tileElement->base_height);
                             }
                         } while (!(tileElement++)->IsLastForTile());
                     }
diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h
index 2fe914be56..8b1c7ac99a 100644
--- a/src/openrct2/ride/Ride.h
+++ b/src/openrct2/ride/Ride.h
@@ -1045,14 +1045,8 @@ int32_t ride_is_valid_for_test(int32_t rideIndex, int32_t goingToBeOpen, int32_t
 int32_t ride_initialise_construction_window(int32_t rideIndex);
 void ride_construction_invalidate_current_track();
 int32_t sub_6C683D(
-    int32_t* x,
-    int32_t* y,
-    int32_t* z,
-    int32_t direction,
-    int32_t type,
-    uint16_t extra_params,
-    rct_tile_element** output_element,
-    uint16_t flags);
+    int32_t* x, int32_t* y, int32_t* z, int32_t direction, int32_t type, uint16_t extra_params,
+    rct_tile_element** output_element, uint16_t flags);
 void ride_set_map_tooltip(rct_tile_element* tileElement);
 int32_t ride_music_params_update(
     int16_t x, int16_t y, int16_t z, uint8_t rideIndex, uint16_t sampleRate, uint32_t position, uint8_t* tuneId);
@@ -1130,15 +1124,8 @@ void ride_construction_set_default_next_piece();
 
 bool track_block_get_next(CoordsXYE* input, CoordsXYE* output, int32_t* z, int32_t* direction);
 bool track_block_get_next_from_zero(
-    int16_t x,
-    int16_t y,
-    int16_t z_start,
-    uint8_t rideIndex,
-    uint8_t direction_start,
-    CoordsXYE* output,
-    int32_t* z,
-    int32_t* direction,
-    bool isGhost);
+    int16_t x, int16_t y, int16_t z_start, uint8_t rideIndex, uint8_t direction_start, CoordsXYE* output, int32_t* z,
+    int32_t* direction, bool isGhost);
 
 bool track_block_get_previous(int32_t x, int32_t y, rct_tile_element* tileElement, track_begin_end* outTrackBeginEnd);
 bool track_block_get_previous_from_zero(
diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp
index 04dec6ce7c..bbe3b880c3 100644
--- a/src/openrct2/ride/RideRatings.cpp
+++ b/src/openrct2/ride/RideRatings.cpp
@@ -929,8 +929,7 @@ static void ride_ratings_apply_adjustments(Ride* ride, rating_tuple* ratings)
 
     // Apply ride entry multipliers
     ride_ratings_add(
-        ratings,
-        (((int32_t)ratings->excitement * rideEntry->excitement_multiplier) >> 7),
+        ratings, (((int32_t)ratings->excitement * rideEntry->excitement_multiplier) >> 7),
         (((int32_t)ratings->intensity * rideEntry->intensity_multiplier) >> 7),
         (((int32_t)ratings->nausea * rideEntry->nausea_multiplier) >> 7));
 
@@ -1377,9 +1376,7 @@ static rating_tuple ride_ratings_get_drop_ratings(Ride* ride)
 
     // Apply highest drop factor
     ride_ratings_add(
-        &result,
-        ((ride->highest_drop_height * 2) * 16000) >> 16,
-        ((ride->highest_drop_height * 2) * 32000) >> 16,
+        &result, ((ride->highest_drop_height * 2) * 16000) >> 16, ((ride->highest_drop_height * 2) * 32000) >> 16,
         ((ride->highest_drop_height * 2) * 10240) >> 16);
 
     return result;
@@ -1489,9 +1486,7 @@ static void ride_ratings_apply_max_speed(
 {
     int32_t modifier = ride->max_speed >> 16;
     ride_ratings_add(
-        ratings,
-        (modifier * excitementMultiplier) >> 16,
-        (modifier * intensityMultiplier) >> 16,
+        ratings, (modifier * excitementMultiplier) >> 16, (modifier * intensityMultiplier) >> 16,
         (modifier * nauseaMultiplier) >> 16);
 }
 
@@ -1512,9 +1507,7 @@ static void ride_ratings_apply_gforces(
 {
     rating_tuple subRating = ride_ratings_get_gforce_ratings(ride);
     ride_ratings_add(
-        ratings,
-        (subRating.excitement * excitementMultiplier) >> 16,
-        (subRating.intensity * intensityMultiplier) >> 16,
+        ratings, (subRating.excitement * excitementMultiplier) >> 16, (subRating.intensity * intensityMultiplier) >> 16,
         (subRating.nausea * nauseaMultiplier) >> 16);
 }
 
@@ -1523,9 +1516,7 @@ static void ride_ratings_apply_turns(
 {
     rating_tuple subRating = ride_ratings_get_turns_ratings(ride);
     ride_ratings_add(
-        ratings,
-        (subRating.excitement * excitementMultiplier) >> 16,
-        (subRating.intensity * intensityMultiplier) >> 16,
+        ratings, (subRating.excitement * excitementMultiplier) >> 16, (subRating.intensity * intensityMultiplier) >> 16,
         (subRating.nausea * nauseaMultiplier) >> 16);
 }
 
@@ -1534,9 +1525,7 @@ static void ride_ratings_apply_drops(
 {
     rating_tuple subRating = ride_ratings_get_drop_ratings(ride);
     ride_ratings_add(
-        ratings,
-        (subRating.excitement * excitementMultiplier) >> 16,
-        (subRating.intensity * intensityMultiplier) >> 16,
+        ratings, (subRating.excitement * excitementMultiplier) >> 16, (subRating.intensity * intensityMultiplier) >> 16,
         (subRating.nausea * nauseaMultiplier) >> 16);
 }
 
@@ -1545,9 +1534,7 @@ static void ride_ratings_apply_sheltered_ratings(
 {
     rating_tuple subRating = ride_ratings_get_sheltered_ratings(ride);
     ride_ratings_add(
-        ratings,
-        (subRating.excitement * excitementMultiplier) >> 16,
-        (subRating.intensity * intensityMultiplier) >> 16,
+        ratings, (subRating.excitement * excitementMultiplier) >> 16, (subRating.intensity * intensityMultiplier) >> 16,
         (subRating.nausea * nauseaMultiplier) >> 16);
 }
 
@@ -1555,9 +1542,7 @@ static void ride_ratings_apply_operation_option(
     rating_tuple* ratings, Ride* ride, int32_t excitementMultiplier, int32_t intensityMultiplier, int32_t nauseaMultiplier)
 {
     ride_ratings_add(
-        ratings,
-        (ride->operation_option * excitementMultiplier) >> 16,
-        (ride->operation_option * intensityMultiplier) >> 16,
+        ratings, (ride->operation_option * excitementMultiplier) >> 16, (ride->operation_option * intensityMultiplier) >> 16,
         (ride->operation_option * nauseaMultiplier) >> 16);
 }
 
@@ -1565,9 +1550,7 @@ static void ride_ratings_apply_rotations(
     rating_tuple* ratings, Ride* ride, int32_t excitementMultiplier, int32_t intensityMultiplier, int32_t nauseaMultiplier)
 {
     ride_ratings_add(
-        ratings,
-        ride->rotations * excitementMultiplier,
-        ride->rotations * intensityMultiplier,
+        ratings, ride->rotations * excitementMultiplier, ride->rotations * intensityMultiplier,
         ride->rotations * nauseaMultiplier);
 }
 
@@ -1582,11 +1565,7 @@ static void ride_ratings_apply_scenery(rating_tuple* ratings, Ride* ride, int32_
 }
 
 static void ride_ratings_apply_highest_drop_height_penalty(
-    rating_tuple* ratings,
-    Ride* ride,
-    int32_t minHighestDropHeight,
-    int32_t excitementPenalty,
-    int32_t intensityPenalty,
+    rating_tuple* ratings, Ride* ride, int32_t minHighestDropHeight, int32_t excitementPenalty, int32_t intensityPenalty,
     int32_t nauseaPenalty)
 {
     if (ride->highest_drop_height < minHighestDropHeight)
@@ -1598,11 +1577,7 @@ static void ride_ratings_apply_highest_drop_height_penalty(
 }
 
 static void ride_ratings_apply_max_speed_penalty(
-    rating_tuple* ratings,
-    Ride* ride,
-    int32_t minMaxSpeed,
-    int32_t excitementPenalty,
-    int32_t intensityPenalty,
+    rating_tuple* ratings, Ride* ride, int32_t minMaxSpeed, int32_t excitementPenalty, int32_t intensityPenalty,
     int32_t nauseaPenalty)
 {
     if (ride->max_speed < minMaxSpeed)
@@ -1614,11 +1589,7 @@ static void ride_ratings_apply_max_speed_penalty(
 }
 
 static void ride_ratings_apply_num_drops_penalty(
-    rating_tuple* ratings,
-    Ride* ride,
-    int32_t minNumDrops,
-    int32_t excitementPenalty,
-    int32_t intensityPenalty,
+    rating_tuple* ratings, Ride* ride, int32_t minNumDrops, int32_t excitementPenalty, int32_t intensityPenalty,
     int32_t nauseaPenalty)
 {
     if ((ride->drops & 0x3F) < minNumDrops)
@@ -1630,11 +1601,7 @@ static void ride_ratings_apply_num_drops_penalty(
 }
 
 static void ride_ratings_apply_max_negative_g_penalty(
-    rating_tuple* ratings,
-    Ride* ride,
-    int32_t maxMaxNegativeVerticalG,
-    int32_t excitementPenalty,
-    int32_t intensityPenalty,
+    rating_tuple* ratings, Ride* ride, int32_t maxMaxNegativeVerticalG, int32_t excitementPenalty, int32_t intensityPenalty,
     int32_t nauseaPenalty)
 {
     if (ride->max_negative_vertical_g >= maxMaxNegativeVerticalG)
@@ -1646,11 +1613,7 @@ static void ride_ratings_apply_max_negative_g_penalty(
 }
 
 static void ride_ratings_apply_max_lateral_g_penalty(
-    rating_tuple* ratings,
-    Ride* ride,
-    int32_t minMaxLateralG,
-    int32_t excitementPenalty,
-    int32_t intensityPenalty,
+    rating_tuple* ratings, Ride* ride, int32_t minMaxLateralG, int32_t excitementPenalty, int32_t intensityPenalty,
     int32_t nauseaPenalty)
 {
     if (ride->max_lateral_g < minMaxLateralG)
@@ -1677,11 +1640,7 @@ static void ride_ratings_apply_excessive_lateral_g_penalty(rating_tuple* ratings
 }
 
 static void ride_ratings_apply_first_length_penalty(
-    rating_tuple* ratings,
-    Ride* ride,
-    int32_t minFirstLength,
-    int32_t excitementPenalty,
-    int32_t intensityPenalty,
+    rating_tuple* ratings, Ride* ride, int32_t minFirstLength, int32_t excitementPenalty, int32_t intensityPenalty,
     int32_t nauseaPenalty)
 {
     if (ride->length[0] < minFirstLength)
diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp
index 21e33aada0..bf22eedeaa 100644
--- a/src/openrct2/ride/Track.cpp
+++ b/src/openrct2/ride/Track.cpp
@@ -947,17 +947,8 @@ static bool track_remove_station_element(int32_t x, int32_t y, int32_t z, int32_
 }
 
 static money32 track_place(
-    int32_t rideIndex,
-    int32_t type,
-    int32_t originX,
-    int32_t originY,
-    int32_t originZ,
-    int32_t direction,
-    int32_t brakeSpeed,
-    int32_t colour,
-    int32_t seatRotation,
-    int32_t liftHillAndAlternativeState,
-    int32_t flags)
+    int32_t rideIndex, int32_t type, int32_t originX, int32_t originY, int32_t originZ, int32_t direction, int32_t brakeSpeed,
+    int32_t colour, int32_t seatRotation, int32_t liftHillAndAlternativeState, int32_t flags)
 {
     Ride* ride = get_ride(rideIndex);
     if (ride == nullptr)
@@ -1568,26 +1559,12 @@ static money32 track_place(
  *  rct2: 0x006C511D
  */
 void game_command_place_track(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     *ebx = track_place(
-        *edx & 0xFF,
-        (*edx >> 8) & 0xFF,
-        (int16_t)(*eax & 0xFFFF),
-        (int16_t)(*ecx & 0xFFFF),
-        (int16_t)(*edi & 0xFFFF),
-        (*ebx >> 8) & 0xFF,
-        (*edi >> 16) & 0xFF,
-        (*edi >> 24) & 0x0F,
-        (*edi >> 28) & 0x0F,
-        (*edx >> 16),
-        *ebx & 0xFF);
+        *edx & 0xFF, (*edx >> 8) & 0xFF, (int16_t)(*eax & 0xFFFF), (int16_t)(*ecx & 0xFFFF), (int16_t)(*edi & 0xFFFF),
+        (*ebx >> 8) & 0xFF, (*edi >> 16) & 0xFF, (*edi >> 24) & 0x0F, (*edi >> 28) & 0x0F, (*edx >> 16), *ebx & 0xFF);
 }
 
 static money32 track_remove(
@@ -1901,12 +1878,7 @@ static money32 track_remove(
  *  rct2: 0x006C5B69
  */
 void game_command_remove_track(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     *ebx = track_remove(
@@ -1918,12 +1890,7 @@ void game_command_remove_track(
  *  rct2: 0x006C5AE9
  */
 void game_command_set_brakes_speed(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     int32_t x = (*eax & 0xFFFF);
diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h
index 59025c66f9..18526ce9c0 100644
--- a/src/openrct2/ride/Track.h
+++ b/src/openrct2/ride/Track.h
@@ -559,13 +559,7 @@ void game_command_remove_track(
 void game_command_set_maze_track(
     int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp);
 money32 maze_set_track(
-    uint16_t x,
-    uint16_t y,
-    uint16_t z,
-    uint8_t flags,
-    bool initialPlacement,
-    uint8_t direction,
-    uint8_t rideIndex,
+    uint16_t x, uint16_t y, uint16_t z, uint8_t flags, bool initialPlacement, uint8_t direction, uint8_t rideIndex,
     uint8_t mode);
 
 void game_command_set_brakes_speed(
diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp
index 8c77696a15..705fd8d158 100644
--- a/src/openrct2/ride/TrackDesign.cpp
+++ b/src/openrct2/ride/TrackDesign.cpp
@@ -836,13 +836,8 @@ static int32_t track_design_place_scenery(
                     case OBJECT_TYPE_LARGE_SCENERY:
                         z = (scenery->z * 8 + originZ) / 8;
                         game_do_command(
-                            mapCoord.x,
-                            flags | (((rotation + scenery->flags) & 0x3) << 8),
-                            mapCoord.y,
-                            z,
-                            GAME_COMMAND_REMOVE_LARGE_SCENERY,
-                            0,
-                            0);
+                            mapCoord.x, flags | (((rotation + scenery->flags) & 0x3) << 8), mapCoord.y, z,
+                            GAME_COMMAND_REMOVE_LARGE_SCENERY, 0, 0);
                         break;
                     case OBJECT_TYPE_WALLS:
                     {
@@ -954,13 +949,8 @@ static int32_t track_design_place_scenery(
                         gGameCommandErrorTitle = STR_CANT_POSITION_THIS_HERE;
 
                         cost = game_do_command(
-                            mapCoord.x,
-                            bl | (entry_index << 8),
-                            mapCoord.y,
-                            quadrant | (scenery->primary_colour << 8),
-                            GAME_COMMAND_PLACE_SCENERY,
-                            rotation | (scenery->secondary_colour << 16),
-                            z);
+                            mapCoord.x, bl | (entry_index << 8), mapCoord.y, quadrant | (scenery->primary_colour << 8),
+                            GAME_COMMAND_PLACE_SCENERY, rotation | (scenery->secondary_colour << 16), z);
 
                         if (cost == MONEY32_UNDEFINED)
                         {
@@ -997,13 +987,9 @@ static int32_t track_design_place_scenery(
                         }
 
                         cost = game_do_command(
-                            mapCoord.x,
-                            bl | (rotation << 8),
-                            mapCoord.y,
-                            scenery->primary_colour | (scenery->secondary_colour << 8),
-                            GAME_COMMAND_PLACE_LARGE_SCENERY,
-                            entry_index,
-                            z);
+                            mapCoord.x, bl | (rotation << 8), mapCoord.y,
+                            scenery->primary_colour | (scenery->secondary_colour << 8), GAME_COMMAND_PLACE_LARGE_SCENERY,
+                            entry_index, z);
 
                         if (cost == MONEY32_UNDEFINED)
                         {
@@ -1041,13 +1027,8 @@ static int32_t track_design_place_scenery(
                         gGameCommandErrorTitle = STR_CANT_BUILD_PARK_ENTRANCE_HERE;
 
                         cost = game_do_command(
-                            mapCoord.x,
-                            bl | (entry_index << 8),
-                            mapCoord.y,
-                            rotation | (scenery->primary_colour << 8),
-                            GAME_COMMAND_PLACE_WALL,
-                            z,
-                            scenery->secondary_colour | ((scenery->flags & 0xFC) << 6));
+                            mapCoord.x, bl | (entry_index << 8), mapCoord.y, rotation | (scenery->primary_colour << 8),
+                            GAME_COMMAND_PLACE_WALL, z, scenery->secondary_colour | ((scenery->flags & 0xFC) << 6));
 
                         if (cost == MONEY32_UNDEFINED)
                         {
@@ -1093,13 +1074,8 @@ static int32_t track_design_place_scenery(
 
                             gGameCommandErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE;
                             cost = game_do_command(
-                                mapCoord.x,
-                                bl | (bh << 8),
-                                mapCoord.y,
-                                z | (entry_index << 8),
-                                GAME_COMMAND_PLACE_PATH_FROM_TRACK,
-                                0,
-                                0);
+                                mapCoord.x, bl | (bh << 8), mapCoord.y, z | (entry_index << 8),
+                                GAME_COMMAND_PLACE_PATH_FROM_TRACK, 0, 0);
                         }
                         else
                         {
@@ -1211,13 +1187,8 @@ static int32_t track_design_place_maze(rct_track_td6* td6, int16_t x, int16_t y,
                     if (_trackDesignPlaceOperation == PTD_OPERATION_1)
                     {
                         cost = game_do_command(
-                            mapCoord.x,
-                            0 | rotation << 8,
-                            mapCoord.y,
-                            (z / 16) & 0xFF,
-                            GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT,
-                            -1,
-                            0);
+                            mapCoord.x, 0 | rotation << 8, mapCoord.y, (z / 16) & 0xFF,
+                            GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT, -1, 0);
                     }
                     else
                     {
@@ -1231,13 +1202,8 @@ static int32_t track_design_place_maze(rct_track_td6* td6, int16_t x, int16_t y,
                                 | GAME_COMMAND_FLAG_GHOST;
                         }
                         cost = game_do_command(
-                            mapCoord.x,
-                            flags | rotation << 8,
-                            mapCoord.y,
-                            rideIndex,
-                            GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT,
-                            0,
-                            0);
+                            mapCoord.x, flags | rotation << 8, mapCoord.y, rideIndex, GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT,
+                            0, 0);
                     }
                     if (cost != MONEY32_UNDEFINED)
                     {
@@ -1255,13 +1221,8 @@ static int32_t track_design_place_maze(rct_track_td6* td6, int16_t x, int16_t y,
                     if (_trackDesignPlaceOperation == PTD_OPERATION_1)
                     {
                         cost = game_do_command(
-                            mapCoord.x,
-                            0 | rotation << 8,
-                            mapCoord.y,
-                            ((z / 16) & 0xFF) | (1 << 8),
-                            GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT,
-                            -1,
-                            0);
+                            mapCoord.x, 0 | rotation << 8, mapCoord.y, ((z / 16) & 0xFF) | (1 << 8),
+                            GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT, -1, 0);
                     }
                     else
                     {
@@ -1275,13 +1236,8 @@ static int32_t track_design_place_maze(rct_track_td6* td6, int16_t x, int16_t y,
                                 | GAME_COMMAND_FLAG_GHOST;
                         }
                         cost = game_do_command(
-                            mapCoord.x,
-                            flags | rotation << 8,
-                            mapCoord.y,
-                            rideIndex | (1 << 8),
-                            GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT,
-                            0,
-                            0);
+                            mapCoord.x, flags | rotation << 8, mapCoord.y, rideIndex | (1 << 8),
+                            GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT, 0, 0);
                     }
                     if (cost != MONEY32_UNDEFINED)
                     {
@@ -1312,13 +1268,8 @@ static int32_t track_design_place_maze(rct_track_td6* td6, int16_t x, int16_t y,
                     gGameCommandErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE;
 
                     cost = game_do_command(
-                        mapCoord.x,
-                        flags | (maze_entry & 0xFF) << 8,
-                        mapCoord.y,
-                        rideIndex | (maze_entry & 0xFF00),
-                        GAME_COMMAND_PLACE_MAZE_DESIGN,
-                        z,
-                        0);
+                        mapCoord.x, flags | (maze_entry & 0xFF) << 8, mapCoord.y, rideIndex | (maze_entry & 0xFF00),
+                        GAME_COMMAND_PLACE_MAZE_DESIGN, z, 0);
                     break;
             }
 
@@ -1382,8 +1333,7 @@ static int32_t track_design_place_maze(rct_track_td6* td6, int16_t x, int16_t y,
     if (_trackDesignPlaceOperation == PTD_OPERATION_CLEAR_OUTLINES)
     {
         ride_action_modify(
-            rideIndex,
-            RIDE_MODIFY_DEMOLISH,
+            rideIndex, RIDE_MODIFY_DEMOLISH,
             GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_GHOST);
     }
 
@@ -1629,13 +1579,8 @@ static bool track_design_place_ride(rct_track_td6* td6, int16_t x, int16_t y, in
 
                         gGameCommandErrorTitle = STR_RIDE_CONSTRUCTION_CANT_CONSTRUCT_THIS_HERE;
                         money32 cost = game_do_command(
-                            x,
-                            bl | (rotation << 8),
-                            y,
-                            rideIndex | (isExit << 8),
-                            GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT,
-                            stationIndex,
-                            0);
+                            x, bl | (rotation << 8), y, rideIndex | (isExit << 8), GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT,
+                            stationIndex, 0);
                         _trackDesignPlaceCost += cost;
 
                         if (cost == MONEY32_UNDEFINED)
@@ -1988,55 +1933,25 @@ static money32 place_track_design(int16_t x, int16_t y, int16_t z, uint8_t flags
     game_do_command(
         0, GAME_COMMAND_FLAG_APPLY | (td6->ride_mode << 8), 0, rideIndex | (0 << 8), GAME_COMMAND_SET_RIDE_SETTING, 0, 0);
     game_do_command(
-        0,
-        GAME_COMMAND_FLAG_APPLY | (0 << 8),
-        0,
-        rideIndex | (td6->number_of_trains << 8),
-        GAME_COMMAND_SET_RIDE_VEHICLES,
-        0,
+        0, GAME_COMMAND_FLAG_APPLY | (0 << 8), 0, rideIndex | (td6->number_of_trains << 8), GAME_COMMAND_SET_RIDE_VEHICLES, 0,
         0);
     game_do_command(
-        0,
-        GAME_COMMAND_FLAG_APPLY | (1 << 8),
-        0,
-        rideIndex | (td6->number_of_cars_per_train << 8),
-        GAME_COMMAND_SET_RIDE_VEHICLES,
-        0,
-        0);
+        0, GAME_COMMAND_FLAG_APPLY | (1 << 8), 0, rideIndex | (td6->number_of_cars_per_train << 8),
+        GAME_COMMAND_SET_RIDE_VEHICLES, 0, 0);
     game_do_command(
         0, GAME_COMMAND_FLAG_APPLY | (td6->depart_flags << 8), 0, rideIndex | (1 << 8), GAME_COMMAND_SET_RIDE_SETTING, 0, 0);
     game_do_command(
-        0,
-        GAME_COMMAND_FLAG_APPLY | (td6->min_waiting_time << 8),
-        0,
-        rideIndex | (2 << 8),
-        GAME_COMMAND_SET_RIDE_SETTING,
-        0,
+        0, GAME_COMMAND_FLAG_APPLY | (td6->min_waiting_time << 8), 0, rideIndex | (2 << 8), GAME_COMMAND_SET_RIDE_SETTING, 0,
         0);
     game_do_command(
-        0,
-        GAME_COMMAND_FLAG_APPLY | (td6->max_waiting_time << 8),
-        0,
-        rideIndex | (3 << 8),
-        GAME_COMMAND_SET_RIDE_SETTING,
-        0,
+        0, GAME_COMMAND_FLAG_APPLY | (td6->max_waiting_time << 8), 0, rideIndex | (3 << 8), GAME_COMMAND_SET_RIDE_SETTING, 0,
         0);
     game_do_command(
-        0,
-        GAME_COMMAND_FLAG_APPLY | (td6->operation_setting << 8),
-        0,
-        rideIndex | (4 << 8),
-        GAME_COMMAND_SET_RIDE_SETTING,
-        0,
+        0, GAME_COMMAND_FLAG_APPLY | (td6->operation_setting << 8), 0, rideIndex | (4 << 8), GAME_COMMAND_SET_RIDE_SETTING, 0,
         0);
     game_do_command(
-        0,
-        GAME_COMMAND_FLAG_APPLY | ((td6->lift_hill_speed_num_circuits & 0x1F) << 8),
-        0,
-        rideIndex | (8 << 8),
-        GAME_COMMAND_SET_RIDE_SETTING,
-        0,
-        0);
+        0, GAME_COMMAND_FLAG_APPLY | ((td6->lift_hill_speed_num_circuits & 0x1F) << 8), 0, rideIndex | (8 << 8),
+        GAME_COMMAND_SET_RIDE_SETTING, 0, 0);
 
     uint8_t num_circuits = td6->lift_hill_speed_num_circuits >> 5;
     if (num_circuits == 0)
@@ -2218,12 +2133,7 @@ static money32 place_maze_design(uint8_t flags, uint8_t rideIndex, uint16_t maze
  *  rct2: 0x006D13FE
  */
 void game_command_place_track_design(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    [[maybe_unused]] int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, [[maybe_unused]] int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     int16_t x = *eax & 0xFFFF;
@@ -2240,20 +2150,11 @@ void game_command_place_track_design(
  *  rct2: 0x006CDEE4
  */
 void game_command_place_maze_design(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     *ebx = place_maze_design(
-        *ebx & 0xFF,
-        *edx & 0xFF,
-        ((*ebx >> 8) & 0xFF) | (((*edx >> 8) & 0xFF) << 8),
-        *eax & 0xFFFF,
-        *ecx & 0xFFFF,
+        *ebx & 0xFF, *edx & 0xFF, ((*ebx >> 8) & 0xFF) | (((*edx >> 8) & 0xFF) << 8), *eax & 0xFFFF, *ecx & 0xFFFF,
         *edi & 0xFFFF);
 }
 
diff --git a/src/openrct2/ride/TrackDesignRepository.cpp b/src/openrct2/ride/TrackDesignRepository.cpp
index 117dc59073..32b46bfde1 100644
--- a/src/openrct2/ride/TrackDesignRepository.cpp
+++ b/src/openrct2/ride/TrackDesignRepository.cpp
@@ -63,11 +63,7 @@ private:
 public:
     explicit TrackDesignFileIndex(const IPlatformEnvironment& env)
         : FileIndex(
-              "track design index",
-              MAGIC_NUMBER,
-              VERSION,
-              env.GetFilePath(PATHID::CACHE_TRACKS),
-              std::string(PATTERN),
+              "track design index", MAGIC_NUMBER, VERSION, env.GetFilePath(PATHID::CACHE_TRACKS), std::string(PATTERN),
               std::vector<std::string>({
                   env.GetDirectoryPath(DIRBASE::RCT1, DIRID::TRACK),
                   env.GetDirectoryPath(DIRBASE::RCT2, DIRID::TRACK),
diff --git a/src/openrct2/ride/TrackDesignSave.cpp b/src/openrct2/ride/TrackDesignSave.cpp
index dddff86ed5..1c19a6595d 100644
--- a/src/openrct2/ride/TrackDesignSave.cpp
+++ b/src/openrct2/ride/TrackDesignSave.cpp
@@ -276,12 +276,7 @@ static void track_design_save_push_tile_element(int32_t x, int32_t y, rct_tile_e
  *  rct2: 0x006D2FA7
  */
 static void track_design_save_push_tile_element_desc(
-    const rct_object_entry* entry,
-    int32_t x,
-    int32_t y,
-    int32_t z,
-    uint8_t flags,
-    uint8_t primaryColour,
+    const rct_object_entry* entry, int32_t x, int32_t y, int32_t z, uint8_t flags, uint8_t primaryColour,
     uint8_t secondaryColour)
 {
     rct_td6_scenery_element* item = &_trackSavedTileElementsDesc[_trackSavedTileElementsDescCount++];
@@ -442,8 +437,7 @@ static void track_design_save_pop_tile_element(int32_t x, int32_t y, rct_tile_el
         if (remainingNumItems > 0)
         {
             memmove(
-                &_trackSavedTileElements[removeIndex],
-                &_trackSavedTileElements[removeIndex + 1],
+                &_trackSavedTileElements[removeIndex], &_trackSavedTileElements[removeIndex + 1],
                 remainingNumItems * sizeof(rct_tile_element*));
         }
         _trackSavedTileElementsCount--;
@@ -482,8 +476,7 @@ static void track_design_save_pop_tile_element_desc(
         if (remainingNumItems > 0)
         {
             memmove(
-                &_trackSavedTileElementsDesc[removeIndex],
-                &_trackSavedTileElementsDesc[removeIndex + 1],
+                &_trackSavedTileElementsDesc[removeIndex], &_trackSavedTileElementsDesc[removeIndex + 1],
                 remainingNumItems * sizeof(rct_td6_scenery_element));
         }
         _trackSavedTileElementsDescCount--;
@@ -1298,8 +1291,7 @@ bool track_design_save_to_file(const utf8* path)
             &td6Buffer, td6->track_elements, track_design_get_track_elements_count(td6) * sizeof(rct_td6_track_element));
         auto_buffer_write(&td6Buffer, &EndMarker, sizeof(EndMarker));
         auto_buffer_write(
-            &td6Buffer,
-            td6->entrance_elements,
+            &td6Buffer, td6->entrance_elements,
             track_design_get_entrance_elements_count(td6) * sizeof(rct_td6_entrance_element));
         auto_buffer_write(&td6Buffer, &EndMarker, sizeof(EndMarker));
     }
diff --git a/src/openrct2/ride/TrackPaint.cpp b/src/openrct2/ride/TrackPaint.cpp
index f88b1b9d8e..d81805f73f 100644
--- a/src/openrct2/ride/TrackPaint.cpp
+++ b/src/openrct2/ride/TrackPaint.cpp
@@ -256,15 +256,8 @@ void track_paint_util_paint_floor(
 }
 
 void track_paint_util_paint_fences(
-    paint_session* session,
-    uint8_t edges,
-    LocationXY16 position,
-    const rct_tile_element* tileElement,
-    Ride* ride,
-    uint32_t colourFlags,
-    uint16_t height,
-    const uint32_t fenceSprites[4],
-    uint8_t rotation)
+    paint_session* session, uint8_t edges, LocationXY16 position, const rct_tile_element* tileElement, Ride* ride,
+    uint32_t colourFlags, uint16_t height, const uint32_t fenceSprites[4], uint8_t rotation)
 {
     uint32_t imageId;
 
@@ -303,14 +296,8 @@ bool track_paint_util_should_paint_supports(LocationXY16 position)
 }
 
 static void track_paint_util_draw_station_impl(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t direction,
-    uint16_t height,
-    uint16_t coverHeight,
-    const rct_tile_element* tileElement,
-    int32_t fenceOffsetA,
-    int32_t fenceOffsetB);
+    paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, uint16_t coverHeight,
+    const rct_tile_element* tileElement, int32_t fenceOffsetA, int32_t fenceOffsetB);
 
 void track_paint_util_draw_station(
     paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, const rct_tile_element* tileElement)
@@ -319,37 +306,22 @@ void track_paint_util_draw_station(
 }
 
 void track_paint_util_draw_station_2(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    int32_t fenceOffsetA,
-    int32_t fenceOffsetB)
+    paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, const rct_tile_element* tileElement,
+    int32_t fenceOffsetA, int32_t fenceOffsetB)
 {
     track_paint_util_draw_station_impl(session, rideIndex, direction, height, height, tileElement, fenceOffsetA, fenceOffsetB);
 }
 
 void track_paint_util_draw_station_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t direction,
-    uint16_t height,
-    uint16_t coverHeight,
+    paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, uint16_t coverHeight,
     const rct_tile_element* tileElement)
 {
     track_paint_util_draw_station_impl(session, rideIndex, direction, height, coverHeight, tileElement, 5, 7);
 }
 
 static void track_paint_util_draw_station_impl(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t direction,
-    uint16_t height,
-    uint16_t coverHeight,
-    const rct_tile_element* tileElement,
-    int32_t fenceOffsetA,
-    int32_t fenceOffsetB)
+    paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, uint16_t coverHeight,
+    const rct_tile_element* tileElement, int32_t fenceOffsetA, int32_t fenceOffsetB)
 {
     LocationXY16 position = session->MapPosition;
     Ride* ride = get_ride(rideIndex);
@@ -553,11 +525,7 @@ static void track_paint_util_draw_station_impl(
 }
 
 void track_paint_util_draw_station_inverted(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
+    paint_session* session, uint8_t rideIndex, uint8_t direction, int32_t height, const rct_tile_element* tileElement,
     uint8_t stationVariant)
 {
     LocationXY16 position = session->MapPosition;
@@ -768,11 +736,7 @@ bool track_paint_util_draw_station_covers(
 }
 
 bool track_paint_util_draw_station_covers_2(
-    paint_session* session,
-    enum edge_t edge,
-    bool hasFence,
-    const rct_ride_entrance_definition* entranceStyle,
-    uint16_t height,
+    paint_session* session, enum edge_t edge, bool hasFence, const rct_ride_entrance_definition* entranceStyle, uint16_t height,
     uint8_t stationVariant)
 {
     if (!(session->Unk141E9DB & (G141E9DB_FLAG_1 | G141E9DB_FLAG_2)))
@@ -835,50 +799,23 @@ bool track_paint_util_draw_station_covers_2(
     {
         imageId = (baseImageId & ~IMAGE_TYPE_TRANSPARENT) + imageOffset;
         sub_98197C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            bounds.x,
-            bounds.y,
-            (int8_t)bounds.z,
-            offset.z,
-            boundsOffset.x,
-            boundsOffset.y,
-            boundsOffset.z);
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, bounds.x, bounds.y, (int8_t)bounds.z, offset.z,
+            boundsOffset.x, boundsOffset.y, boundsOffset.z);
 
         uint32_t edi = session->TrackColours[SCHEME_TRACK] & (0b11111 << 19);
 
         // weird jump
         imageId = (baseImageId | edi) + ((1 << 23) | (1 << 24) | (1 << 25)) + imageOffset + 12;
         sub_98199C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            bounds.x,
-            bounds.y,
-            (int8_t)bounds.z,
-            offset.z,
-            boundsOffset.x,
-            boundsOffset.y,
-            boundsOffset.z);
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, bounds.x, bounds.y, (int8_t)bounds.z, offset.z,
+            boundsOffset.x, boundsOffset.y, boundsOffset.z);
         return true;
     }
 
     imageId = (baseImageId + imageOffset) | session->TrackColours[SCHEME_TRACK];
     sub_98197C(
-        session,
-        imageId,
-        (int8_t)offset.x,
-        (int8_t)offset.y,
-        bounds.x,
-        bounds.y,
-        (int8_t)bounds.z,
-        offset.z,
-        boundsOffset.x,
-        boundsOffset.y,
-        boundsOffset.z);
+        session, imageId, (int8_t)offset.x, (int8_t)offset.y, bounds.x, bounds.y, (int8_t)bounds.z, offset.z, boundsOffset.x,
+        boundsOffset.y, boundsOffset.z);
     return true;
 }
 
@@ -928,14 +865,8 @@ void track_paint_util_draw_station_platform(
 }
 
 void track_paint_util_draw_pier(
-    paint_session* session,
-    Ride* ride,
-    const rct_ride_entrance_definition* entranceStyle,
-    LocationXY16 position,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    uint8_t rotation)
+    paint_session* session, Ride* ride, const rct_ride_entrance_definition* entranceStyle, LocationXY16 position,
+    uint8_t direction, int32_t height, const rct_tile_element* tileElement, uint8_t rotation)
 {
     bool hasFence;
     uint32_t imageId;
@@ -1049,16 +980,9 @@ const LocationXYZ16 defaultRightHelixUpSmallQuarterBoundOffsets[4][3][2] = {
 static constexpr const int8_t right_helix_up_small_quarter_tiles_sprite_map[] = { 0, -1, 1, 2 };
 
 void track_paint_util_right_helix_up_small_quarter_tiles_paint(
-    paint_session* session,
-    const int8_t thickness[2],
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4][3][2],
-    const LocationXY16 offsets[4][3][2],
-    const LocationXY16 boundsLengths[4][3][2],
-    const LocationXYZ16 boundsOffsets[4][3][2])
+    paint_session* session, const int8_t thickness[2], int16_t height, int32_t direction, uint8_t trackSequence,
+    uint32_t colourFlags, const uint32_t sprites[4][3][2], const LocationXY16 offsets[4][3][2],
+    const LocationXY16 boundsLengths[4][3][2], const LocationXYZ16 boundsOffsets[4][3][2])
 {
     int32_t index = right_helix_up_small_quarter_tiles_sprite_map[trackSequence];
     if (index < 0)
@@ -1075,17 +999,8 @@ void track_paint_util_right_helix_up_small_quarter_tiles_paint(
             = (boundsOffsets == nullptr ? LocationXYZ16{ offset.x, offset.y, 0 } : boundsOffsets[direction][index][0]);
 
         sub_98197C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            boundsLength.x,
-            boundsLength.y,
-            thickness[0],
-            height,
-            boundsOffset.x,
-            boundsOffset.y,
-            height + boundsOffset.z);
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, boundsLength.x, boundsLength.y, thickness[0], height,
+            boundsOffset.x, boundsOffset.y, height + boundsOffset.z);
     }
     if (sprites[direction][index][1] != 0)
     {
@@ -1096,17 +1011,8 @@ void track_paint_util_right_helix_up_small_quarter_tiles_paint(
             = (boundsOffsets == nullptr ? LocationXYZ16{ offset.x, offset.y, 0 } : boundsOffsets[direction][index][1]);
 
         sub_98197C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            boundsLength.x,
-            boundsLength.y,
-            thickness[1],
-            height,
-            boundsOffset.x,
-            boundsOffset.y,
-            height + boundsOffset.z);
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, boundsLength.x, boundsLength.y, thickness[1], height,
+            boundsOffset.x, boundsOffset.y, height + boundsOffset.z);
     }
 }
 
@@ -1174,16 +1080,9 @@ const LocationXY16 defaultRightHelixUpLargeQuarterBoundLengths[4][5][2] = {
 
 static constexpr const int8_t right_helix_up_large_quarter_sprite_map[] = { 0, -1, 1, 2, -1, 3, 4 };
 void track_paint_util_right_helix_up_large_quarter_tiles_paint(
-    paint_session* session,
-    const int8_t thickness[2],
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4][5][2],
-    const LocationXY16 offsets[4][5][2],
-    const LocationXY16 boundsLengths[4][5][2],
-    const LocationXYZ16 boundsOffsets[4][5][2])
+    paint_session* session, const int8_t thickness[2], int16_t height, int32_t direction, uint8_t trackSequence,
+    uint32_t colourFlags, const uint32_t sprites[4][5][2], const LocationXY16 offsets[4][5][2],
+    const LocationXY16 boundsLengths[4][5][2], const LocationXYZ16 boundsOffsets[4][5][2])
 {
     int32_t index = right_helix_up_large_quarter_sprite_map[trackSequence];
     if (index < 0)
@@ -1200,17 +1099,8 @@ void track_paint_util_right_helix_up_large_quarter_tiles_paint(
             = (boundsOffsets == nullptr ? LocationXYZ16{ offset.x, offset.y, 0 } : boundsOffsets[direction][index][0]);
 
         sub_98197C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            boundsLength.x,
-            boundsLength.y,
-            thickness[0],
-            height,
-            boundsOffset.x,
-            boundsOffset.y,
-            height + boundsOffset.z);
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, boundsLength.x, boundsLength.y, thickness[0], height,
+            boundsOffset.x, boundsOffset.y, height + boundsOffset.z);
     }
     if (sprites[direction][index][1] != 0)
     {
@@ -1221,17 +1111,8 @@ void track_paint_util_right_helix_up_large_quarter_tiles_paint(
             = (boundsOffsets == nullptr ? LocationXYZ16{ offset.x, offset.y, 0 } : boundsOffsets[direction][index][1]);
 
         sub_98197C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            boundsLength.x,
-            boundsLength.y,
-            thickness[1],
-            height,
-            boundsOffset.x,
-            boundsOffset.y,
-            height + boundsOffset.z);
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, boundsLength.x, boundsLength.y, thickness[1], height,
+            boundsOffset.x, boundsOffset.y, height + boundsOffset.z);
     }
 }
 
@@ -1374,16 +1255,9 @@ const uint8_t mapLeftEighthTurnToOrthogonal[] = { 4, 2, 3, 1, 0 };
 
 static constexpr const int8_t eighth_to_diag_sprite_map[] = { 0, 1, 2, -1, 3 };
 void track_paint_util_eighth_to_diag_tiles_paint(
-    paint_session* session,
-    const int8_t thickness[4][4],
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4][4],
-    const LocationXY16 offsets[4][4],
-    const LocationXY16 boundsLengths[4][4],
-    const LocationXYZ16 boundsOffsets[4][4])
+    paint_session* session, const int8_t thickness[4][4], int16_t height, int32_t direction, uint8_t trackSequence,
+    uint32_t colourFlags, const uint32_t sprites[4][4], const LocationXY16 offsets[4][4],
+    const LocationXY16 boundsLengths[4][4], const LocationXYZ16 boundsOffsets[4][4])
 {
     int32_t index = eighth_to_diag_sprite_map[trackSequence];
     if (index < 0)
@@ -1398,17 +1272,8 @@ void track_paint_util_eighth_to_diag_tiles_paint(
         = (boundsOffsets == nullptr ? LocationXYZ16{ offset.x, offset.y, 0 } : boundsOffsets[direction][index]);
 
     sub_98197C(
-        session,
-        imageId,
-        (int8_t)offset.x,
-        (int8_t)offset.y,
-        boundsLength.x,
-        boundsLength.y,
-        thickness[direction][index],
-        height,
-        boundsOffset.x,
-        boundsOffset.y,
-        height + boundsOffset.z);
+        session, imageId, (int8_t)offset.x, (int8_t)offset.y, boundsLength.x, boundsLength.y, thickness[direction][index],
+        height, boundsOffset.x, boundsOffset.y, height + boundsOffset.z);
 }
 
 const LocationXY16 defaultDiagTileOffsets[4] = {
@@ -1433,15 +1298,8 @@ static constexpr const int8_t diag_sprite_map[4][4] = {
 };
 
 void track_paint_util_diag_tiles_paint(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4],
-    const LocationXY16 offsets[4],
-    const LocationXY16 boundsLengths[4],
+    paint_session* session, int8_t thickness, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
+    const uint32_t sprites[4], const LocationXY16 offsets[4], const LocationXY16 boundsLengths[4],
     const LocationXYZ16 boundsOffsets[4])
 {
     int32_t index = diag_sprite_map[direction][trackSequence];
@@ -1456,17 +1314,8 @@ void track_paint_util_diag_tiles_paint(
     LocationXYZ16 boundsOffset = (boundsOffsets == nullptr ? LocationXYZ16{ offset.x, offset.y, 0 } : boundsOffsets[direction]);
 
     sub_98197C(
-        session,
-        imageId,
-        (int8_t)offset.x,
-        (int8_t)offset.y,
-        boundsLength.x,
-        boundsLength.y,
-        thickness,
-        height,
-        boundsOffset.x,
-        boundsOffset.y,
-        height + boundsOffset.z);
+        session, imageId, (int8_t)offset.x, (int8_t)offset.y, boundsLength.x, boundsLength.y, thickness, height, boundsOffset.x,
+        boundsOffset.y, height + boundsOffset.z);
 }
 
 const uint8_t mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[] = {
@@ -1571,15 +1420,8 @@ static constexpr const int8_t right_quarter_turn_5_tiles_sprite_map[] = {
 };
 
 void track_paint_util_right_quarter_turn_5_tiles_paint(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4][5],
-    const LocationXY16 offsets[4][5],
-    const LocationXY16 boundsLengths[4][5],
+    paint_session* session, int8_t thickness, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
+    const uint32_t sprites[4][5], const LocationXY16 offsets[4][5], const LocationXY16 boundsLengths[4][5],
     const LocationXYZ16 boundsOffsets[4][5])
 {
     int32_t index = right_quarter_turn_5_tiles_sprite_map[trackSequence];
@@ -1595,25 +1437,12 @@ void track_paint_util_right_quarter_turn_5_tiles_paint(
         = (boundsOffsets == nullptr ? LocationXYZ16{ offset.x, offset.y, 0 } : boundsOffsets[direction][index]);
 
     sub_98197C(
-        session,
-        imageId,
-        (int8_t)offset.x,
-        (int8_t)offset.y,
-        boundsLength.x,
-        boundsLength.y,
-        thickness,
-        height,
-        boundsOffset.x,
-        boundsOffset.y,
-        height + boundsOffset.z);
+        session, imageId, (int8_t)offset.x, (int8_t)offset.y, boundsLength.x, boundsLength.y, thickness, height, boundsOffset.x,
+        boundsOffset.y, height + boundsOffset.z);
 }
 
 void track_paint_util_right_quarter_turn_5_tiles_paint_2(
-    paint_session* session,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
+    paint_session* session, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
     const sprite_bb sprites[][5])
 {
     int8_t sprite = right_quarter_turn_5_tiles_sprite_map[trackSequence];
@@ -1625,25 +1454,13 @@ void track_paint_util_right_quarter_turn_5_tiles_paint_2(
     const sprite_bb* spriteBB = &sprites[direction][sprite];
     uint32_t imageId = spriteBB->sprite_id | colourFlags;
     sub_98197C(
-        session,
-        imageId,
-        (int8_t)spriteBB->offset.x,
-        (int8_t)spriteBB->offset.y,
-        spriteBB->bb_size.x,
-        spriteBB->bb_size.y,
-        (int8_t)spriteBB->bb_size.z,
-        height + spriteBB->offset.z,
-        spriteBB->bb_offset.x,
-        spriteBB->bb_offset.y,
+        session, imageId, (int8_t)spriteBB->offset.x, (int8_t)spriteBB->offset.y, spriteBB->bb_size.x, spriteBB->bb_size.y,
+        (int8_t)spriteBB->bb_size.z, height + spriteBB->offset.z, spriteBB->bb_offset.x, spriteBB->bb_offset.y,
         height + spriteBB->bb_offset.z);
 }
 
 void track_paint_util_right_quarter_turn_5_tiles_paint_3(
-    paint_session* session,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
+    paint_session* session, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
     const sprite_bb sprites[][5])
 {
     int8_t sprite = right_quarter_turn_5_tiles_sprite_map[trackSequence];
@@ -1655,14 +1472,8 @@ 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(
-        session,
-        imageId,
-        (int8_t)spriteBB->offset.x,
-        (int8_t)spriteBB->offset.y,
-        spriteBB->bb_size.x,
-        spriteBB->bb_size.y,
-        (int8_t)spriteBB->bb_size.z,
-        height + spriteBB->offset.z);
+        session, imageId, (int8_t)spriteBB->offset.x, (int8_t)spriteBB->offset.y, spriteBB->bb_size.x, spriteBB->bb_size.y,
+        (int8_t)spriteBB->bb_size.z, height + spriteBB->offset.z);
 }
 
 void track_paint_util_right_quarter_turn_5_tiles_tunnel(
@@ -1786,15 +1597,8 @@ static constexpr const int8_t right_quarter_turn_3_tiles_sprite_map[] = {
 };
 
 void track_paint_util_right_quarter_turn_3_tiles_paint(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4][3],
-    const LocationXY16 offsets[4][3],
-    const LocationXY16 boundsLengths[4][3],
+    paint_session* session, int8_t thickness, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
+    const uint32_t sprites[4][3], const LocationXY16 offsets[4][3], const LocationXY16 boundsLengths[4][3],
     const LocationXYZ16 boundsOffsets[4][3])
 {
     int32_t index = right_quarter_turn_3_tiles_sprite_map[trackSequence];
@@ -1810,26 +1614,12 @@ void track_paint_util_right_quarter_turn_3_tiles_paint(
         = (boundsOffsets == nullptr ? LocationXYZ16{ offset.x, offset.y, 0 } : boundsOffsets[direction][index]);
 
     sub_98197C(
-        session,
-        imageId,
-        (int8_t)offset.x,
-        (int8_t)offset.y,
-        boundsLength.x,
-        boundsLength.y,
-        thickness,
-        height,
-        boundsOffset.x,
-        boundsOffset.y,
-        height + boundsOffset.z);
+        session, imageId, (int8_t)offset.x, (int8_t)offset.y, boundsLength.x, boundsLength.y, thickness, height, boundsOffset.x,
+        boundsOffset.y, height + boundsOffset.z);
 }
 
 void track_paint_util_right_quarter_turn_3_tiles_paint_2(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
+    paint_session* session, int8_t thickness, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
     const uint32_t sprites[4][3])
 {
     track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(
@@ -1837,14 +1627,8 @@ void track_paint_util_right_quarter_turn_3_tiles_paint_2(
 }
 
 void track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4][3],
-    int32_t heightOffset)
+    paint_session* session, int8_t thickness, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
+    const uint32_t sprites[4][3], int32_t heightOffset)
 {
     int8_t sprite = right_quarter_turn_3_tiles_sprite_map[trackSequence];
     if (sprite < 0)
@@ -1919,11 +1703,7 @@ void track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(
 }
 
 void track_paint_util_right_quarter_turn_3_tiles_paint_3(
-    paint_session* session,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
+    paint_session* session, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
     const sprite_bb sprites[4][3])
 {
     int8_t sprite = right_quarter_turn_3_tiles_sprite_map[trackSequence];
@@ -1933,25 +1713,13 @@ void track_paint_util_right_quarter_turn_3_tiles_paint_3(
     }
     const sprite_bb* spriteBB = &sprites[direction][sprite];
     sub_98197C(
-        session,
-        spriteBB->sprite_id | colourFlags,
-        (int8_t)spriteBB->offset.x,
-        (int8_t)spriteBB->offset.y,
-        spriteBB->bb_size.x,
-        spriteBB->bb_size.y,
-        (int8_t)spriteBB->bb_size.z,
-        spriteBB->offset.z + height,
-        spriteBB->bb_offset.x,
-        spriteBB->bb_offset.y,
-        height + spriteBB->bb_offset.z);
+        session, spriteBB->sprite_id | colourFlags, (int8_t)spriteBB->offset.x, (int8_t)spriteBB->offset.y, spriteBB->bb_size.x,
+        spriteBB->bb_size.y, (int8_t)spriteBB->bb_size.z, spriteBB->offset.z + height, spriteBB->bb_offset.x,
+        spriteBB->bb_offset.y, height + spriteBB->bb_offset.z);
 }
 
 void track_paint_util_right_quarter_turn_3_tiles_paint_4(
-    paint_session* session,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
+    paint_session* session, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
     const sprite_bb sprites[4][3])
 {
     int8_t sprite = right_quarter_turn_3_tiles_sprite_map[trackSequence];
@@ -1963,14 +1731,8 @@ 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(
-        session,
-        imageId,
-        (int8_t)spriteBB->offset.x,
-        (int8_t)spriteBB->offset.y,
-        spriteBB->bb_size.x,
-        spriteBB->bb_size.y,
-        (int8_t)spriteBB->bb_size.z,
-        height + spriteBB->offset.z);
+        session, imageId, (int8_t)spriteBB->offset.x, (int8_t)spriteBB->offset.y, spriteBB->bb_size.x, spriteBB->bb_size.y,
+        (int8_t)spriteBB->bb_size.z, height + spriteBB->offset.z);
 }
 
 void track_paint_util_right_quarter_turn_3_tiles_tunnel(
@@ -2047,12 +1809,7 @@ static constexpr const int8_t left_quarter_turn_3_tiles_sprite_map[] = {
 };
 
 void track_paint_util_left_quarter_turn_3_tiles_paint(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
+    paint_session* session, int8_t thickness, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
     const uint32_t sprites[4][3])
 {
     track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(
@@ -2060,14 +1817,8 @@ void track_paint_util_left_quarter_turn_3_tiles_paint(
 }
 
 void track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4][3],
-    int32_t heightOffset)
+    paint_session* session, int8_t thickness, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
+    const uint32_t sprites[4][3], int32_t heightOffset)
 {
     int8_t sprite = left_quarter_turn_3_tiles_sprite_map[trackSequence];
     if (sprite < 0)
@@ -2184,12 +1935,7 @@ void track_paint_util_left_quarter_turn_3_tiles_tunnel(
 }
 
 void track_paint_util_left_quarter_turn_1_tile_paint(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int16_t boundBoxZOffset,
-    int32_t direction,
-    uint32_t colourFlags,
+    paint_session* session, int8_t thickness, int16_t height, int16_t boundBoxZOffset, int32_t direction, uint32_t colourFlags,
     const uint32_t* sprites)
 {
     uint32_t imageId = sprites[direction] | colourFlags;
@@ -2212,12 +1958,7 @@ void track_paint_util_left_quarter_turn_1_tile_paint(
 }
 
 void track_paint_util_right_quarter_turn_1_tile_tunnel(
-    paint_session* session,
-    uint8_t direction,
-    uint16_t baseHeight,
-    int8_t startOffset,
-    uint8_t startTunnel,
-    int8_t endOffset,
+    paint_session* session, uint8_t direction, uint16_t baseHeight, int8_t startOffset, uint8_t startTunnel, int8_t endOffset,
     uint8_t endTunnel)
 {
     track_paint_util_left_quarter_turn_1_tile_tunnel(
@@ -2225,12 +1966,7 @@ void track_paint_util_right_quarter_turn_1_tile_tunnel(
 }
 
 void track_paint_util_left_quarter_turn_1_tile_tunnel(
-    paint_session* session,
-    uint8_t direction,
-    uint16_t baseHeight,
-    int8_t startOffset,
-    uint8_t startTunnel,
-    int8_t endOffset,
+    paint_session* session, uint8_t direction, uint16_t baseHeight, int8_t startOffset, uint8_t startTunnel, int8_t endOffset,
     uint8_t endTunnel)
 {
     switch (direction)
@@ -2387,19 +2123,15 @@ void track_paint_util_left_corkscrew_up_supports(paint_session* session, uint8_t
     if (direction == 2)
     {
         paint_util_set_segment_support_height(
-            session,
-            paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-            0xFFFF,
-            0);
+            session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+            0xFFFF, 0);
     }
     metal_a_supports_paint_setup(session, METAL_SUPPORTS_TUBES, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
     if (direction != 2)
     {
         paint_util_set_segment_support_height(
-            session,
-            paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-            0xFFFF,
-            0);
+            session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+            0xFFFF, 0);
     }
 }
 
diff --git a/src/openrct2/ride/TrackPaint.h b/src/openrct2/ride/TrackPaint.h
index 21a93e3c2f..d6450617ea 100644
--- a/src/openrct2/ride/TrackPaint.h
+++ b/src/openrct2/ride/TrackPaint.h
@@ -281,97 +281,45 @@ bool track_paint_util_has_fence(
 void track_paint_util_paint_floor(
     paint_session* session, uint8_t edges, uint32_t colourFlags, uint16_t height, const uint32_t floorSprites[4]);
 void track_paint_util_paint_fences(
-    paint_session* session,
-    uint8_t edges,
-    LocationXY16 position,
-    const rct_tile_element* tileElement,
-    Ride* ride,
-    uint32_t colourFlags,
-    uint16_t height,
-    const uint32_t fenceSprites[4],
-    uint8_t rotation);
+    paint_session* session, uint8_t edges, LocationXY16 position, const rct_tile_element* tileElement, Ride* ride,
+    uint32_t colourFlags, uint16_t height, const uint32_t fenceSprites[4], uint8_t rotation);
 bool track_paint_util_draw_station_covers(
-    paint_session* session,
-    enum edge_t edge,
-    bool hasFence,
-    const rct_ride_entrance_definition* entranceStyle,
+    paint_session* session, enum edge_t edge, bool hasFence, const rct_ride_entrance_definition* entranceStyle,
     uint16_t height);
 bool track_paint_util_draw_station_covers_2(
-    paint_session* session,
-    enum edge_t edge,
-    bool hasFence,
-    const rct_ride_entrance_definition* entranceStyle,
-    uint16_t height,
+    paint_session* session, enum edge_t edge, bool hasFence, const rct_ride_entrance_definition* entranceStyle, uint16_t height,
     uint8_t stationVariant);
 void track_paint_util_draw_station_platform(
-    paint_session* session,
-    Ride* ride,
-    uint8_t direction,
-    int32_t height,
-    int32_t zOffset,
+    paint_session* session, Ride* ride, uint8_t direction, int32_t height, int32_t zOffset,
     const rct_tile_element* tileElement);
 void track_paint_util_draw_station(
     paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, const rct_tile_element* tileElement);
 void track_paint_util_draw_station_2(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    int32_t fenceOffsetA,
-    int32_t fenceOffsetB);
+    paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, const rct_tile_element* tileElement,
+    int32_t fenceOffsetA, int32_t fenceOffsetB);
 void track_paint_util_draw_station_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t direction,
-    uint16_t height,
-    uint16_t coverHeight,
+    paint_session* session, uint8_t rideIndex, uint8_t direction, uint16_t height, uint16_t coverHeight,
     const rct_tile_element* tileElement);
 void track_paint_util_draw_station_inverted(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
+    paint_session* session, uint8_t rideIndex, uint8_t direction, int32_t height, const rct_tile_element* tileElement,
     uint8_t stationVariant);
 bool track_paint_util_should_paint_supports(LocationXY16 position);
 void track_paint_util_draw_pier(
-    paint_session* session,
-    Ride* ride,
-    const rct_ride_entrance_definition* entranceStyle,
-    LocationXY16 position,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    uint8_t rotation);
+    paint_session* session, Ride* ride, const rct_ride_entrance_definition* entranceStyle, LocationXY16 position,
+    uint8_t direction, int32_t height, const rct_tile_element* tileElement, uint8_t rotation);
 void track_paint_util_draw_station_metal_supports(paint_session* session, uint8_t direction, uint16_t height, uint32_t colour);
 void track_paint_util_draw_station_metal_supports_2(
     paint_session* session, uint8_t direction, uint16_t height, uint32_t colour, uint8_t type);
 
 void track_paint_util_right_quarter_turn_5_tiles_paint(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4][5],
-    const LocationXY16 offsets[4][5],
-    const LocationXY16 boundsLengths[4][5],
+    paint_session* session, int8_t thickness, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
+    const uint32_t sprites[4][5], const LocationXY16 offsets[4][5], const LocationXY16 boundsLengths[4][5],
     const LocationXYZ16 boundsOffsets[4][5]);
 void track_paint_util_right_quarter_turn_5_tiles_paint_2(
-    paint_session* session,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
+    paint_session* session, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
     const sprite_bb sprites[][5]);
 void track_paint_util_right_quarter_turn_5_tiles_paint_3(
-    paint_session* session,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
+    paint_session* session, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
     const sprite_bb sprites[][5]);
 void track_paint_util_right_quarter_turn_5_tiles_tunnel(
     paint_session* session, int16_t height, uint8_t direction, uint8_t trackSequence, uint8_t tunnelType);
@@ -382,75 +330,33 @@ void track_paint_util_right_quarter_turn_3_tiles_25_deg_up_tunnel(
 void track_paint_util_right_quarter_turn_3_tiles_25_deg_down_tunnel(
     paint_session* session, int16_t height, uint8_t direction, uint8_t trackSequence, uint8_t tunnelType0, uint8_t tunnelType3);
 void track_paint_util_right_quarter_turn_3_tiles_paint(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4][3],
-    const LocationXY16 offsets[4][3],
-    const LocationXY16 boundsLengths[4][3],
+    paint_session* session, int8_t thickness, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
+    const uint32_t sprites[4][3], const LocationXY16 offsets[4][3], const LocationXY16 boundsLengths[4][3],
     const LocationXYZ16 boundsOffsets[4][3]);
 void track_paint_util_right_quarter_turn_3_tiles_paint_2(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
+    paint_session* session, int8_t thickness, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
     const uint32_t sprites[4][3]);
 void track_paint_util_right_quarter_turn_3_tiles_paint_2_with_height_offset(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4][3],
-    int32_t heightOffset);
+    paint_session* session, int8_t thickness, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
+    const uint32_t sprites[4][3], int32_t heightOffset);
 void track_paint_util_right_quarter_turn_3_tiles_paint_3(
-    paint_session* session,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
+    paint_session* session, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
     const sprite_bb sprites[4][3]);
 void track_paint_util_right_quarter_turn_3_tiles_paint_4(
-    paint_session* session,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
+    paint_session* session, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
     const sprite_bb sprites[4][3]);
 void track_paint_util_right_quarter_turn_3_tiles_tunnel(
     paint_session* session, int16_t height, uint8_t direction, uint8_t trackSequence, uint8_t tunnelType);
 void track_paint_util_left_quarter_turn_3_tiles_paint(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
+    paint_session* session, int8_t thickness, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
     const uint32_t sprites[4][3]);
 void track_paint_util_left_quarter_turn_3_tiles_paint_with_height_offset(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4][3],
-    int32_t heightOffset);
+    paint_session* session, int8_t thickness, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
+    const uint32_t sprites[4][3], int32_t heightOffset);
 void track_paint_util_left_quarter_turn_3_tiles_tunnel(
     paint_session* session, int16_t height, uint8_t tunnelType, uint8_t direction, uint8_t trackSequence);
 void track_paint_util_left_quarter_turn_1_tile_paint(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int16_t boundBoxZOffset,
-    int32_t direction,
-    uint32_t colourFlags,
+    paint_session* session, int8_t thickness, int16_t height, int16_t boundBoxZOffset, int32_t direction, uint32_t colourFlags,
     const uint32_t* sprites);
 void track_paint_util_spinning_tunnel_paint(paint_session* session, int8_t thickness, int16_t height, uint8_t direction);
 void track_paint_util_onride_photo_small_paint(
@@ -458,65 +364,27 @@ void track_paint_util_onride_photo_small_paint(
 void track_paint_util_onride_photo_paint(
     paint_session* session, uint8_t direction, int32_t height, const rct_tile_element* tileElement);
 void track_paint_util_right_helix_up_small_quarter_tiles_paint(
-    paint_session* session,
-    const int8_t thickness[2],
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4][3][2],
-    const LocationXY16 offsets[4][3][2],
-    const LocationXY16 boundsLengths[4][3][2],
-    const LocationXYZ16 boundsOffsets[4][3][2]);
+    paint_session* session, const int8_t thickness[2], int16_t height, int32_t direction, uint8_t trackSequence,
+    uint32_t colourFlags, const uint32_t sprites[4][3][2], const LocationXY16 offsets[4][3][2],
+    const LocationXY16 boundsLengths[4][3][2], const LocationXYZ16 boundsOffsets[4][3][2]);
 void track_paint_util_right_helix_up_large_quarter_tiles_paint(
-    paint_session* session,
-    const int8_t thickness[2],
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4][5][2],
-    const LocationXY16 offsets[4][5][2],
-    const LocationXY16 boundsLengths[4][5][2],
-    const LocationXYZ16 boundsOffsets[4][5][2]);
+    paint_session* session, const int8_t thickness[2], int16_t height, int32_t direction, uint8_t trackSequence,
+    uint32_t colourFlags, const uint32_t sprites[4][5][2], const LocationXY16 offsets[4][5][2],
+    const LocationXY16 boundsLengths[4][5][2], const LocationXYZ16 boundsOffsets[4][5][2]);
 void track_paint_util_eighth_to_diag_tiles_paint(
-    paint_session* session,
-    const int8_t thickness[4][4],
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4][4],
-    const LocationXY16 offsets[4][4],
-    const LocationXY16 boundsLengths[4][4],
-    const LocationXYZ16 boundsOffsets[4][4]);
+    paint_session* session, const int8_t thickness[4][4], int16_t height, int32_t direction, uint8_t trackSequence,
+    uint32_t colourFlags, const uint32_t sprites[4][4], const LocationXY16 offsets[4][4],
+    const LocationXY16 boundsLengths[4][4], const LocationXYZ16 boundsOffsets[4][4]);
 void track_paint_util_diag_tiles_paint(
-    paint_session* session,
-    int8_t thickness,
-    int16_t height,
-    int32_t direction,
-    uint8_t trackSequence,
-    uint32_t colourFlags,
-    const uint32_t sprites[4],
-    const LocationXY16 offsets[4],
-    const LocationXY16 boundsLengths[4],
+    paint_session* session, int8_t thickness, int16_t height, int32_t direction, uint8_t trackSequence, uint32_t colourFlags,
+    const uint32_t sprites[4], const LocationXY16 offsets[4], const LocationXY16 boundsLengths[4],
     const LocationXYZ16 boundsOffsets[4]);
 
 void track_paint_util_left_quarter_turn_1_tile_tunnel(
-    paint_session* session,
-    uint8_t direction,
-    uint16_t baseHeight,
-    int8_t startOffset,
-    uint8_t startTunnel,
-    int8_t endOffset,
+    paint_session* session, uint8_t direction, uint16_t baseHeight, int8_t startOffset, uint8_t startTunnel, int8_t endOffset,
     uint8_t endTunnel);
 void track_paint_util_right_quarter_turn_1_tile_tunnel(
-    paint_session* session,
-    uint8_t direction,
-    uint16_t baseHeight,
-    int8_t startOffset,
-    uint8_t startTunnel,
-    int8_t endOffset,
+    paint_session* session, uint8_t direction, uint16_t baseHeight, int8_t startOffset, uint8_t startTunnel, int8_t endOffset,
     uint8_t endTunnel);
 
 void track_paint_util_right_vertical_loop_segments(paint_session* session, uint8_t direction, uint8_t trackSequence);
@@ -524,11 +392,7 @@ void track_paint_util_right_vertical_loop_segments(paint_session* session, uint8
 void track_paint_util_left_corkscrew_up_supports(paint_session* session, uint8_t direction, uint16_t height);
 
 using TRACK_PAINT_FUNCTION = void (*)(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement);
 using TRACK_PAINT_FUNCTION_GETTER = TRACK_PAINT_FUNCTION (*)(int32_t trackType, int32_t direction);
 
diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index d48376cd22..ba9903efa0 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -908,8 +908,7 @@ static void vehicle_update_sound_params(rct_vehicle* vehicle)
     rct_vehicle_sound_params* soundParam;
     // Find a sound param of lower priority to use
     for (soundParam = &gVehicleSoundParamsList[0];
-         soundParam < gVehicleSoundParamsListEnd && sound_priority <= soundParam->priority;
-         soundParam++)
+         soundParam < gVehicleSoundParamsListEnd && sound_priority <= soundParam->priority; soundParam++)
         ;
 
     if (soundParam >= &gVehicleSoundParamsList[Util::CountOf(gVehicleSoundParamsList)])
@@ -1146,12 +1145,8 @@ static void vehicle_sounds_update_sound_1(
         uint8_t looping = _soundParams[vehicle->sound1_id][0];
         int32_t pan = sound_params->pan_x;
         sound->sound1_channel = Mixer_Play_Effect(
-            vehicle->sound1_id,
-            looping ? MIXER_LOOP_INFINITE : MIXER_LOOP_NONE,
-            DStoMixerVolume(volume),
-            DStoMixerPan(pan),
-            DStoMixerRate(frequency),
-            0);
+            vehicle->sound1_id, looping ? MIXER_LOOP_INFINITE : MIXER_LOOP_NONE, DStoMixerVolume(volume), DStoMixerPan(pan),
+            DStoMixerRate(frequency), 0);
         return;
     }
     if (volume != sound->sound1_volume)
@@ -1216,12 +1211,8 @@ static void vehicle_sounds_update_sound_2(
         uint8_t looping = _soundParams[vehicle->sound2_id][0];
         int32_t pan = sound_params->pan_x;
         sound->sound2_channel = Mixer_Play_Effect(
-            vehicle->sound2_id,
-            looping ? MIXER_LOOP_INFINITE : MIXER_LOOP_NONE,
-            DStoMixerVolume(volume),
-            DStoMixerPan(pan),
-            DStoMixerRate(frequency),
-            0);
+            vehicle->sound2_id, looping ? MIXER_LOOP_INFINITE : MIXER_LOOP_NONE, DStoMixerVolume(volume), DStoMixerPan(pan),
+            DStoMixerRate(frequency), 0);
         return;
     }
     if (volume != sound->sound2_volume)
@@ -1273,8 +1264,7 @@ void vehicle_sounds_update()
         {
             bool keepPlaying = false;
             for (rct_vehicle_sound_params* vehicle_sound_params = &gVehicleSoundParamsList[0];
-                 vehicle_sound_params != gVehicleSoundParamsListEnd;
-                 vehicle_sound_params++)
+                 vehicle_sound_params != gVehicleSoundParamsListEnd; vehicle_sound_params++)
             {
                 if (vehicle_sound.id == vehicle_sound_params->id)
                 {
@@ -1299,8 +1289,7 @@ void vehicle_sounds_update()
     }
 
     for (rct_vehicle_sound_params* vehicleSoundParams = &gVehicleSoundParamsList[0];
-         vehicleSoundParams < gVehicleSoundParamsListEnd;
-         vehicleSoundParams++)
+         vehicleSoundParams < gVehicleSoundParamsListEnd; vehicleSoundParams++)
     {
         uint8_t panVol = vehicle_sounds_update_get_pan_volume(vehicleSoundParams);
 
@@ -2573,15 +2562,8 @@ static void vehicle_update_waiting_to_depart(rct_vehicle* vehicle)
         int32_t direction;
 
         if (track_block_get_next_from_zero(
-                vehicle->track_x,
-                vehicle->track_y,
-                vehicle->track_z,
-                vehicle->ride,
-                (uint8_t)(vehicle->track_direction & 0x3),
-                &track,
-                &z,
-                &direction,
-                false))
+                vehicle->track_x, vehicle->track_y, vehicle->track_z, vehicle->ride, (uint8_t)(vehicle->track_direction & 0x3),
+                &track, &z, &direction, false))
         {
             if (track_element_is_cable_lift(track.element))
             {
@@ -5408,8 +5390,7 @@ static void vehicle_update_crash(rct_vehicle* vehicle)
                 if ((scenario_rand() & 0xFFFF) <= 0x1555)
                 {
                     sprite_misc_explosion_cloud_create(
-                        curVehicle->x + ((scenario_rand() & 2) - 1),
-                        curVehicle->y + ((scenario_rand() & 2) - 1),
+                        curVehicle->x + ((scenario_rand() & 2) - 1), curVehicle->y + ((scenario_rand() & 2) - 1),
                         curVehicle->z);
                 }
             }
@@ -7304,8 +7285,7 @@ static void vehicle_update_additional_animation(rct_vehicle* vehicle)
                             index += 32;
                         }
                         steam_particle_create(
-                            vehicle->x + SteamParticleOffsets[index].x,
-                            vehicle->y + SteamParticleOffsets[index].y,
+                            vehicle->x + SteamParticleOffsets[index].x, vehicle->y + SteamParticleOffsets[index].y,
                             vehicle->z + SteamParticleOffsets[index].z);
                     }
                 }
@@ -9438,8 +9418,7 @@ loc_6DCEFF:
     if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SPINNING)
     {
         vehicle->spin_speed = Math::Clamp(
-            static_cast<int16_t>(-VEHICLE_MAX_SPIN_SPEED_WATER_RIDE),
-            vehicle->spin_speed,
+            static_cast<int16_t>(-VEHICLE_MAX_SPIN_SPEED_WATER_RIDE), vehicle->spin_speed,
             static_cast<int16_t>(VEHICLE_MAX_SPIN_SPEED_WATER_RIDE));
     }
 
@@ -9559,8 +9538,7 @@ static void vehicle_update_track_motion_powered_ride_acceleration(
         if (vehicleEntry->flags & VEHICLE_ENTRY_FLAG_SPINNING)
         {
             vehicle->spin_speed = Math::Clamp(
-                static_cast<int16_t>(-VEHICLE_MAX_SPIN_SPEED_WATER_RIDE),
-                vehicle->spin_speed,
+                static_cast<int16_t>(-VEHICLE_MAX_SPIN_SPEED_WATER_RIDE), vehicle->spin_speed,
                 static_cast<int16_t>(VEHICLE_MAX_SPIN_SPEED_WATER_RIDE));
         }
 
diff --git a/src/openrct2/ride/VehiclePaint.cpp b/src/openrct2/ride/VehiclePaint.cpp
index cebc099d50..e75d351de9 100644
--- a/src/openrct2/ride/VehiclePaint.cpp
+++ b/src/openrct2/ride/VehiclePaint.cpp
@@ -888,11 +888,7 @@ const vehicle_boundbox VehicleBoundboxes[16][224] = {
 
 // 6D5214
 static void vehicle_sprite_paint(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t ebx,
-    int32_t ecx,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t ebx, int32_t ecx, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     int32_t baseImage_id = ebx;
@@ -934,16 +930,7 @@ static void vehicle_sprite_paint(
                     image_id += (vehicleEntry->no_vehicle_images * vehicle->animation_frame);
                 }
                 sub_98199C(
-                    session,
-                    image_id,
-                    0,
-                    0,
-                    bb.length_x,
-                    bb.length_y,
-                    bb.length_z,
-                    z,
-                    bb.offset_x,
-                    bb.offset_y,
+                    session, image_id, 0, 0, bb.length_x, bb.length_y, bb.length_z, z, bb.offset_x, bb.offset_y,
                     bb.offset_z + z);
                 baseImage_id += vehicleEntry->no_vehicle_images;
             }
@@ -954,11 +941,7 @@ static void vehicle_sprite_paint(
 
 // 6D520E
 static void vehicle_sprite_paint_6D520E(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t ebx,
-    int32_t ecx,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t ebx, int32_t ecx, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     vehicle_sprite_paint(session, vehicle, ebx + vehicle->swing_sprite, ecx, z, vehicleEntry);
@@ -1010,10 +993,7 @@ static void vehicle_sprite_paint_6D51DE(
 
 // 6D51DE
 static void vehicle_sprite_0_0(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     vehicle_sprite_paint_6D51DE(session, vehicle, imageDirection, z, vehicleEntry);
@@ -1021,10 +1001,7 @@ static void vehicle_sprite_0_0(
 
 // 6D4EE7
 static void vehicle_sprite_0_1(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED)
@@ -1041,10 +1018,7 @@ static void vehicle_sprite_0_1(
 
 // 6D4F34
 static void vehicle_sprite_0_2(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED)
@@ -1061,10 +1035,7 @@ static void vehicle_sprite_0_2(
 
 // 6D4F0C
 static void vehicle_sprite_0_3(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED)
@@ -1081,10 +1052,7 @@ static void vehicle_sprite_0_3(
 
 // 6D4F5C
 static void vehicle_sprite_0_4(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED)
@@ -1101,10 +1069,7 @@ static void vehicle_sprite_0_4(
 
 // 6D4F84
 static void vehicle_sprite_0_5(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -1125,10 +1090,7 @@ static void vehicle_sprite_0_5(
 
 // 6D4FE4
 static void vehicle_sprite_0_6(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -1149,10 +1111,7 @@ static void vehicle_sprite_0_6(
 
 // 6D5055
 static void vehicle_sprite_0_7(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -1173,10 +1132,7 @@ static void vehicle_sprite_0_7(
 
 // 6D50C6
 static void vehicle_sprite_0_8(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -1197,10 +1153,7 @@ static void vehicle_sprite_0_8(
 
 // 6D5137
 static void vehicle_sprite_0_9(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -1221,10 +1174,7 @@ static void vehicle_sprite_0_9(
 
 // 6D4FB1
 static void vehicle_sprite_0_10(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -1245,10 +1195,7 @@ static void vehicle_sprite_0_10(
 
 // 6D501B
 static void vehicle_sprite_0_11(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -1269,10 +1216,7 @@ static void vehicle_sprite_0_11(
 
 // 6D508C
 static void vehicle_sprite_0_12(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -1293,10 +1237,7 @@ static void vehicle_sprite_0_12(
 
 // 6D50FD
 static void vehicle_sprite_0_13(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -1317,10 +1258,7 @@ static void vehicle_sprite_0_13(
 
 // 6D516E
 static void vehicle_sprite_0_14(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -1341,10 +1279,7 @@ static void vehicle_sprite_0_14(
 
 // 6D4EE4
 static void vehicle_sprite_0_16(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     vehicleEntry--;
@@ -1362,10 +1297,7 @@ static void vehicle_sprite_0_16(
 
 // 6D4F31
 static void vehicle_sprite_0_17(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     vehicleEntry--;
@@ -1383,10 +1315,7 @@ static void vehicle_sprite_0_17(
 
 // 6D4F09
 static void vehicle_sprite_0_18(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     vehicleEntry--;
@@ -1404,10 +1333,7 @@ static void vehicle_sprite_0_18(
 
 // 6D4F59
 static void vehicle_sprite_0_19(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     vehicleEntry--;
@@ -1425,10 +1351,7 @@ static void vehicle_sprite_0_19(
 
 // 6D51D7
 static void vehicle_sprite_0(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     // 0x009A3DE4:
@@ -1499,10 +1422,7 @@ static void vehicle_sprite_0(
 
 // 6D4614
 static void vehicle_sprite_1_0(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES)
@@ -1519,10 +1439,7 @@ static void vehicle_sprite_1_0(
 
 // 6D4662
 static void vehicle_sprite_1_1(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS)
@@ -1539,10 +1456,7 @@ static void vehicle_sprite_1_1(
 
 // 6D46DB
 static void vehicle_sprite_1_2(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS)
@@ -1559,10 +1473,7 @@ static void vehicle_sprite_1_2(
 
 // 6D467D
 static void vehicle_sprite_1_3(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS)
@@ -1579,10 +1490,7 @@ static void vehicle_sprite_1_3(
 
 // 6D46FD
 static void vehicle_sprite_1_4(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS)
@@ -1600,10 +1508,7 @@ static void vehicle_sprite_1_4(
 
 // 6D460D
 static void vehicle_sprite_1(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     // 0x009A3C04:
@@ -1674,10 +1579,7 @@ static void vehicle_sprite_1(
 
 // 6D4791
 static void vehicle_sprite_2_0(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES)
@@ -1703,10 +1605,7 @@ static void vehicle_sprite_2_0(
 
 // 6D4833
 static void vehicle_sprite_2_1(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS)
@@ -1723,10 +1622,7 @@ static void vehicle_sprite_2_1(
 
 // 6D48D6
 static void vehicle_sprite_2_2(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS)
@@ -1753,10 +1649,7 @@ static void vehicle_sprite_2_2(
 
 // 6D4858
 static void vehicle_sprite_2_3(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS)
@@ -1774,10 +1667,7 @@ static void vehicle_sprite_2_3(
 
 // 6D4910
 static void vehicle_sprite_2_4(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS)
@@ -1806,10 +1696,7 @@ static void vehicle_sprite_2_4(
 
 // 6D476C
 static void vehicle_sprite_2(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     // 0x009A3CA4:
@@ -1880,10 +1767,7 @@ static void vehicle_sprite_2(
 
 // 6D49DC
 static void vehicle_sprite_3(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (!(vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES))
@@ -1900,10 +1784,7 @@ static void vehicle_sprite_3(
 
 // 6D4A31
 static void vehicle_sprite_4(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (!(vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES))
@@ -1920,10 +1801,7 @@ static void vehicle_sprite_4(
 
 // 6D463D
 static void vehicle_sprite_5_0(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES)
@@ -1940,10 +1818,7 @@ static void vehicle_sprite_5_0(
 
 // 6D469B
 static void vehicle_sprite_5_1(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS)
@@ -1960,10 +1835,7 @@ static void vehicle_sprite_5_1(
 
 // 6D4722
 static void vehicle_sprite_5_2(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS)
@@ -1981,10 +1853,7 @@ static void vehicle_sprite_5_2(
 
 // 6D46B9
 static void vehicle_sprite_5_3(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS)
@@ -2001,10 +1870,7 @@ static void vehicle_sprite_5_3(
 
 // 6D4747
 static void vehicle_sprite_5_4(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS)
@@ -2022,10 +1888,7 @@ static void vehicle_sprite_5_4(
 
 // 6D4636
 static void vehicle_sprite_5(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     // 0x009A3C54:
@@ -2096,10 +1959,7 @@ static void vehicle_sprite_5(
 
 // 6D47E4
 static void vehicle_sprite_6_0(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES)
@@ -2125,10 +1985,7 @@ static void vehicle_sprite_6_0(
 
 // 6D4880
 static void vehicle_sprite_6_1(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS)
@@ -2146,10 +2003,7 @@ static void vehicle_sprite_6_1(
 
 // 6D4953
 static void vehicle_sprite_6_2(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS)
@@ -2178,10 +2032,7 @@ static void vehicle_sprite_6_2(
 
 // 6D48AB
 static void vehicle_sprite_6_3(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS)
@@ -2199,10 +2050,7 @@ static void vehicle_sprite_6_3(
 
 // 6D4996
 static void vehicle_sprite_6_4(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS)
@@ -2231,10 +2079,7 @@ static void vehicle_sprite_6_4(
 
 // 6D47DD
 static void vehicle_sprite_6(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     // 0x009A3CF4:
@@ -2305,10 +2150,7 @@ static void vehicle_sprite_6(
 
 // 6D4A05
 static void vehicle_sprite_7(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES)
@@ -2325,10 +2167,7 @@ static void vehicle_sprite_7(
 
 // 6D4A59
 static void vehicle_sprite_8(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES)
@@ -2345,10 +2184,7 @@ static void vehicle_sprite_8(
 
 // 6D4A81
 static void vehicle_sprite_9(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES)
@@ -2365,10 +2201,7 @@ static void vehicle_sprite_9(
 
 // 6D4AE8
 static void vehicle_sprite_10(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES)
@@ -2385,10 +2218,7 @@ static void vehicle_sprite_10(
 
 // 6D4B57
 static void vehicle_sprite_11(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES)
@@ -2405,10 +2235,7 @@ static void vehicle_sprite_11(
 
 // 6D4BB7
 static void vehicle_sprite_12(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES)
@@ -2425,10 +2252,7 @@ static void vehicle_sprite_12(
 
 // 6D4C17
 static void vehicle_sprite_13(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES)
@@ -2445,10 +2269,7 @@ static void vehicle_sprite_13(
 
 // 6D4C77
 static void vehicle_sprite_14(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES)
@@ -2465,10 +2286,7 @@ static void vehicle_sprite_14(
 
 // 6D4CD7
 static void vehicle_sprite_15(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES)
@@ -2485,10 +2303,7 @@ static void vehicle_sprite_15(
 
 // 6D4D37
 static void vehicle_sprite_16(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES)
@@ -2505,10 +2320,7 @@ static void vehicle_sprite_16(
 
 // 6D4AA3
 static void vehicle_sprite_17(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -2533,10 +2345,7 @@ static void vehicle_sprite_17(
 
 // 6D4B0D
 static void vehicle_sprite_18(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -2562,10 +2371,7 @@ static void vehicle_sprite_18(
 
 // 6D4B80
 static void vehicle_sprite_19(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -2586,10 +2392,7 @@ static void vehicle_sprite_19(
 
 // 6D4BE0
 static void vehicle_sprite_20(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -2610,10 +2413,7 @@ static void vehicle_sprite_20(
 
 // 6D4C40
 static void vehicle_sprite_21(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -2634,10 +2434,7 @@ static void vehicle_sprite_21(
 
 // 6D4CA0
 static void vehicle_sprite_22(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -2658,10 +2455,7 @@ static void vehicle_sprite_22(
 
 // 6D4D00
 static void vehicle_sprite_23(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -2682,10 +2476,7 @@ static void vehicle_sprite_23(
 
 // 6D51A5
 static void vehicle_sprite_24(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->update_flags & VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES)
@@ -2707,10 +2498,7 @@ static void vehicle_sprite_24(
 
 // 6D4D67
 static void vehicle_sprite_50_0(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES)
@@ -2727,10 +2515,7 @@ static void vehicle_sprite_50_0(
 
 // 6D4DB5
 static void vehicle_sprite_50_1(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS)
@@ -2748,10 +2533,7 @@ static void vehicle_sprite_50_1(
 
 // 6D4DD3
 static void vehicle_sprite_50_3(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS)
@@ -2769,10 +2551,7 @@ static void vehicle_sprite_50_3(
 
 // 6D4D60
 static void vehicle_sprite_50(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     // 0x009A3D44:
@@ -2843,10 +2622,7 @@ static void vehicle_sprite_50(
 
 // 6D4E3A
 static void vehicle_sprite_51(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES)
@@ -2863,10 +2639,7 @@ static void vehicle_sprite_51(
 
 // 6D4E8F
 static void vehicle_sprite_52(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES)
@@ -2883,10 +2656,7 @@ static void vehicle_sprite_52(
 
 // 6D4D90
 static void vehicle_sprite_53_0(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES)
@@ -2903,10 +2673,7 @@ static void vehicle_sprite_53_0(
 
 // 6D4DF4
 static void vehicle_sprite_53_1(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS)
@@ -2924,10 +2691,7 @@ static void vehicle_sprite_53_1(
 
 // 6D4E15
 static void vehicle_sprite_53_3(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS)
@@ -2945,10 +2709,7 @@ static void vehicle_sprite_53_3(
 
 // 6D4D89
 static void vehicle_sprite_53(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     // 0x009A3D94:
@@ -3019,10 +2780,7 @@ static void vehicle_sprite_53(
 
 // 6D4E63
 static void vehicle_sprite_54(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES)
@@ -3039,10 +2797,7 @@ static void vehicle_sprite_54(
 
 // 6D4EB8
 static void vehicle_sprite_55(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES)
@@ -3059,10 +2814,7 @@ static void vehicle_sprite_55(
 
 // 6D47DA
 static void vehicle_sprite_56(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     vehicleEntry--;
@@ -3071,10 +2823,7 @@ static void vehicle_sprite_56(
 
 // 6D4A02
 static void vehicle_sprite_57(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     vehicleEntry--;
@@ -3092,10 +2841,7 @@ static void vehicle_sprite_57(
 
 // 6D4A56
 static void vehicle_sprite_58(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     vehicleEntry--;
@@ -3113,10 +2859,7 @@ static void vehicle_sprite_58(
 
 // 6D4773
 static void vehicle_sprite_59(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_CURVED_LIFT_HILL)
@@ -3133,10 +2876,7 @@ static void vehicle_sprite_59(
 
 // 0x009A3B14:
 using vehicle_sprite_func = void (*)(
-    paint_session* session,
-    const rct_vehicle* vehicle,
-    int32_t imageDirection,
-    int32_t z,
+    paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection, int32_t z,
     const rct_ride_entry_vehicle* vehicleEntry);
 
 // clang-format off
@@ -3362,10 +3102,7 @@ void vehicle_visual_splash_effect(
  *  rct2: 0x006D45F8
  */
 void vehicle_visual_default(
-    paint_session* session,
-    int32_t imageDirection,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t imageDirection, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->vehicle_sprite_type < Util::CountOf(vehicle_sprite_funcs))
diff --git a/src/openrct2/ride/VehiclePaint.h b/src/openrct2/ride/VehiclePaint.h
index 71361fd8d4..7047f4094d 100644
--- a/src/openrct2/ride/VehiclePaint.h
+++ b/src/openrct2/ride/VehiclePaint.h
@@ -31,76 +31,33 @@ extern const vehicle_boundbox VehicleBoundboxes[16][224];
 void vehicle_paint(paint_session* session, const rct_vehicle* vehicle, int32_t imageDirection);
 
 void vehicle_visual_default(
-    paint_session* session,
-    int32_t imageDirection,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t imageDirection, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry);
 void vehicle_visual_roto_drop(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry);
 void vehicle_visual_observation_tower(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry);
 void vehicle_visual_river_rapids(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry);
 void vehicle_visual_reverser(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry);
 void vehicle_visual_splash_boats_or_water_coaster(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry);
 void vehicle_visual_launched_freefall(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry);
 void vehicle_visual_splash_effect(
     paint_session* session, int32_t z, const rct_vehicle* vehicle, const rct_ride_entry_vehicle* vehicleEntry);
 void vehicle_visual_virginia_reel(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry);
 void vehicle_visual_submarine(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry);
 void vehicle_visual_mini_golf_player(
     paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle);
diff --git a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp
index 67e77bc61a..b014558296 100644
--- a/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp
+++ b/src/openrct2/ride/coaster/AirPoweredVerticalCoaster.cpp
@@ -175,11 +175,7 @@ static uint32_t air_powered_vertical_rc_get_support_colour(paint_session* sessio
 
 /** rct2: 0x008AFAD4 */
 static void air_powered_vertical_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4] = {
@@ -201,11 +197,7 @@ static void air_powered_vertical_rc_track_flat(
 }
 
 static void air_powered_vertical_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -216,30 +208,10 @@ static void air_powered_vertical_rc_track_station(
     };
 
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][1] | session->TrackColours[SCHEME_MISC],
-        0,
-        0,
-        32,
-        28,
-        1,
-        height - 2,
-        0,
-        2,
+        session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height - 2, 0, 2,
         height);
     sub_98199C_rotated(
-        session,
-        direction,
-        imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-        0,
-        0,
-        32,
-        20,
-        1,
-        height,
-        0,
-        6,
+        session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
         height);
 
     wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
@@ -254,11 +226,7 @@ static void air_powered_vertical_rc_track_station(
 }
 
 static void air_powered_vertical_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const sprite_bb imageIds[4][5] = {
@@ -311,8 +279,7 @@ static void air_powered_vertical_rc_track_right_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
@@ -320,8 +287,7 @@ static void air_powered_vertical_rc_track_right_quarter_turn_5(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_C4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 4:
             paint_util_set_segment_support_height(
@@ -332,8 +298,7 @@ static void air_powered_vertical_rc_track_right_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D4 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 6:
             paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@@ -344,11 +309,7 @@ static void air_powered_vertical_rc_track_right_quarter_turn_5(
 }
 
 static void air_powered_vertical_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -358,11 +319,7 @@ static void air_powered_vertical_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x008AFB74 */
 static void air_powered_vertical_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -391,11 +348,7 @@ static void air_powered_vertical_rc_track_flat_to_left_bank(
 
 /** rct2: 0x008AFB84 */
 static void air_powered_vertical_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -423,11 +376,7 @@ static void air_powered_vertical_rc_track_flat_to_right_bank(
 }
 
 static void air_powered_vertical_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     air_powered_vertical_rc_track_flat_to_right_bank(
@@ -436,11 +385,7 @@ static void air_powered_vertical_rc_track_left_bank_to_flat(
 
 /** rct2: 0x008AFBA4 */
 static void air_powered_vertical_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     air_powered_vertical_rc_track_flat_to_left_bank(
@@ -448,11 +393,7 @@ static void air_powered_vertical_rc_track_right_bank_to_flat(
 }
 
 static void air_powered_vertical_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const sprite_bb imageIds[4][5] = {
@@ -519,8 +460,7 @@ static void air_powered_vertical_rc_track_banked_right_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
@@ -528,8 +468,7 @@ static void air_powered_vertical_rc_track_banked_right_quarter_turn_5(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_C4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 4:
             paint_util_set_segment_support_height(
@@ -540,8 +479,7 @@ static void air_powered_vertical_rc_track_banked_right_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D4 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 6:
             paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@@ -552,11 +490,7 @@ static void air_powered_vertical_rc_track_banked_right_quarter_turn_5(
 }
 
 static void air_powered_vertical_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -566,11 +500,7 @@ static void air_powered_vertical_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x008AFBD4 */
 static void air_powered_vertical_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4] = {
@@ -599,22 +529,14 @@ static void air_powered_vertical_rc_track_left_bank(
 }
 
 static void air_powered_vertical_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     air_powered_vertical_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void air_powered_vertical_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4] = {
@@ -636,11 +558,7 @@ static void air_powered_vertical_rc_track_brakes(
 }
 
 static void air_powered_vertical_rc_track_vertical_slope_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t trackImageIds[7][4] = {
@@ -844,11 +762,7 @@ static void air_powered_vertical_rc_track_vertical_slope_up(
 }
 
 static void air_powered_vertical_rc_track_vertical_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -885,11 +799,7 @@ static void air_powered_vertical_rc_track_vertical_up(
 }
 
 static void air_powered_vertical_rc_track_vertical_top(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (direction == 2 || direction == 3)
@@ -900,17 +810,13 @@ static void air_powered_vertical_rc_track_vertical_top(
     }
 
     static constexpr const uint32_t imageIds[4][6] = {
-        { SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_SW_NE,
-          SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_0,
+        { SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_SW_NE, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_0,
           SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_1,
-          SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_2,
-          SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_NE_SW,
+          SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_2, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_NE_SW,
           SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_SW_NE_SEQ_3 },
-        { SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_NW_SE,
-          SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_NW_SE_SEQ_0,
+        { SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_NW_SE, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_NW_SE_SEQ_0,
           SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_NW_SE_SEQ_1,
-          SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_NW_SE_SEQ_2,
-          SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_SE_NW,
+          SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_NW_SE_SEQ_2, SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_SUPPORT_SE_NW,
           SPR_AIR_POWERED_VERTICAL_RC_VERTICAL_TOP_TRACK_NW_SE_SEQ_3 },
     };
 
@@ -976,22 +882,14 @@ static void air_powered_vertical_rc_track_vertical_top(
 }
 
 static void air_powered_vertical_rc_track_vertical_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     air_powered_vertical_rc_track_vertical_up(session, rideIndex, trackSequence ^ 1, (direction + 2) & 3, height, tileElement);
 }
 
 static void air_powered_vertical_rc_track_vertical_slope_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     air_powered_vertical_rc_track_vertical_slope_up(
diff --git a/src/openrct2/ride/coaster/BobsleighCoaster.cpp b/src/openrct2/ride/coaster/BobsleighCoaster.cpp
index f65218bcc5..cc474fb99e 100644
--- a/src/openrct2/ride/coaster/BobsleighCoaster.cpp
+++ b/src/openrct2/ride/coaster/BobsleighCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x006FE5B4 */
 static void bobsleigh_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -83,11 +79,7 @@ static void bobsleigh_rc_track_flat(
 }
 
 static void bobsleigh_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -98,17 +90,7 @@ static void bobsleigh_rc_track_station(
     };
 
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-        0,
-        0,
-        32,
-        20,
-        1,
-        height,
-        0,
-        6,
+        session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
         height + 3);
     sub_98196C_rotated(
         session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
@@ -121,11 +103,7 @@ static void bobsleigh_rc_track_station(
 
 /** rct2: 0x006FE5C4 */
 static void bobsleigh_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -211,11 +189,7 @@ static void bobsleigh_rc_track_25_deg_up(
 
 /** rct2: 0x006FE5D4 */
 static void bobsleigh_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -301,11 +275,7 @@ static void bobsleigh_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x006FE5E4 */
 static void bobsleigh_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -391,11 +361,7 @@ static void bobsleigh_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x006FE5F4 */
 static void bobsleigh_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bobsleigh_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -403,11 +369,7 @@ static void bobsleigh_rc_track_25_deg_down(
 
 /** rct2: 0x006FE604 */
 static void bobsleigh_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bobsleigh_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -415,11 +377,7 @@ static void bobsleigh_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x006FE614 */
 static void bobsleigh_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bobsleigh_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -427,11 +385,7 @@ static void bobsleigh_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x006FE624 */
 static void bobsleigh_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -443,68 +397,28 @@ static void bobsleigh_rc_track_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14707, 0, 2, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14727,
-                        0,
-                        2,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14727, 0, 2, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14712, 0, 2, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14732,
-                        0,
-                        2,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14732, 0, 2, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14717, 0, 2, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14737,
-                        0,
-                        2,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14737, 0, 2, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14702, 0, 2, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14722,
-                        0,
-                        2,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14722, 0, 2, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
             }
@@ -527,90 +441,30 @@ static void bobsleigh_rc_track_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14706, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14726,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14726, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14711, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14731,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14731, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14716,
-                        0,
-                        16,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14716, 0, 16, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14736,
-                        0,
-                        16,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14736, 0, 16, 32, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14701,
-                        0,
-                        16,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14701, 0, 16, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14721,
-                        0,
-                        16,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14721, 0, 16, 32, 16, 0, height, 0, 16,
                         height + 27);
                     break;
             }
@@ -618,8 +472,7 @@ static void bobsleigh_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -627,103 +480,33 @@ static void bobsleigh_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14705,
-                        0,
-                        16,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14705, 0, 16, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14725,
-                        0,
-                        16,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14725, 0, 16, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14710,
-                        16,
-                        16,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14710, 16, 16, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14730,
-                        16,
-                        16,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14730, 16, 16, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14715,
-                        16,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14715, 16, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14735,
-                        16,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14735, 16, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14700, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14720,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14720, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
             }
@@ -739,92 +522,32 @@ static void bobsleigh_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14704,
-                        16,
-                        0,
-                        16,
-                        34,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14704, 16, 0, 16, 34, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14724,
-                        16,
-                        0,
-                        16,
-                        34,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14724, 16, 0, 16, 34, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14709, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14729,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14729, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14714, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14734,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14734, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14699,
-                        16,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14699, 16, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14719,
-                        16,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14719, 16, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     break;
             }
@@ -832,8 +555,7 @@ static void bobsleigh_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -843,68 +565,28 @@ static void bobsleigh_rc_track_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14703, 2, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14723,
-                        2,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14723, 2, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14708, 2, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14728,
-                        2,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14728, 2, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14713, 2, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14733,
-                        2,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14733, 2, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14698, 2, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14718,
-                        2,
-                        0,
-                        30,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14718, 2, 0, 30, 32, 0, height, 6, 0,
                         height + 27);
                     break;
             }
@@ -927,11 +609,7 @@ static void bobsleigh_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x006FE634 */
 static void bobsleigh_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -940,11 +618,7 @@ static void bobsleigh_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x006FE644 */
 static void bobsleigh_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -986,11 +660,7 @@ static void bobsleigh_rc_track_flat_to_left_bank(
 
 /** rct2: 0x006FE654 */
 static void bobsleigh_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1032,11 +702,7 @@ static void bobsleigh_rc_track_flat_to_right_bank(
 
 /** rct2: 0x006FE664 */
 static void bobsleigh_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1078,11 +744,7 @@ static void bobsleigh_rc_track_left_bank_to_flat(
 
 /** rct2: 0x006FE674 */
 static void bobsleigh_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1124,11 +786,7 @@ static void bobsleigh_rc_track_right_bank_to_flat(
 
 /** rct2: 0x006FE684 */
 static void bobsleigh_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1140,68 +798,28 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14747, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14767,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14767, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14752, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14772,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14772, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14757, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14777,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14777, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14742, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14762,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14762, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
             }
@@ -1224,90 +842,30 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14746, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14766,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14766, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14751, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14771,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14771, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14756,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14756, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14776,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14776, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14741,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14741, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14761,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14761, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     break;
             }
@@ -1315,8 +873,7 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -1324,103 +881,33 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14745,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14745, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14765,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14765, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14750,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14750, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14770,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14770, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14755,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14755, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14775,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14775, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14740, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14760,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14760, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
             }
@@ -1436,92 +923,32 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14744,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14744, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14764,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14764, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14749, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14769,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14769, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14754, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14774,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14774, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14739,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14739, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14759,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14759, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     break;
             }
@@ -1529,8 +956,7 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -1540,68 +966,28 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14743, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14763,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14763, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14748, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14768,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14768, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14753, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14773,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14773, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14738, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14758,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14758, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
             }
@@ -1624,11 +1010,7 @@ static void bobsleigh_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x006FE694 */
 static void bobsleigh_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1637,11 +1019,7 @@ static void bobsleigh_rc_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x006FE6A4 */
 static void bobsleigh_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1690,11 +1068,7 @@ static void bobsleigh_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x006FE6B4 */
 static void bobsleigh_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1743,11 +1117,7 @@ static void bobsleigh_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x006FE6C4 */
 static void bobsleigh_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1796,11 +1166,7 @@ static void bobsleigh_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x006FE6D4 */
 static void bobsleigh_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1849,11 +1215,7 @@ static void bobsleigh_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x006FE6E4 */
 static void bobsleigh_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bobsleigh_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1861,11 +1223,7 @@ static void bobsleigh_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x006FE6F4 */
 static void bobsleigh_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bobsleigh_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1873,11 +1231,7 @@ static void bobsleigh_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x006FE704 */
 static void bobsleigh_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bobsleigh_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1885,11 +1239,7 @@ static void bobsleigh_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x006FE714 */
 static void bobsleigh_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bobsleigh_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1897,11 +1247,7 @@ static void bobsleigh_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x006FE724 */
 static void bobsleigh_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1943,11 +1289,7 @@ static void bobsleigh_rc_track_left_bank(
 
 /** rct2: 0x006FE734 */
 static void bobsleigh_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bobsleigh_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1955,11 +1297,7 @@ static void bobsleigh_rc_track_right_bank(
 
 /** rct2: 0x006FE744 */
 static void bobsleigh_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1971,68 +1309,28 @@ static void bobsleigh_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14826, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14842,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14842, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14830, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14846,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14846, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14829, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14845,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14845, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14833, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14849,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14849, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
             }
@@ -2052,17 +1350,7 @@ static void bobsleigh_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14827, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14843,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14843, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2071,17 +1359,7 @@ static void bobsleigh_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14831, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14847,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14847, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2090,34 +1368,14 @@ static void bobsleigh_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14828, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14844,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14844, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14832, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14848,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14848, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     break;
             }
@@ -2125,8 +1383,7 @@ static void bobsleigh_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2136,51 +1393,21 @@ static void bobsleigh_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14828, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14844,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14844, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14832, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14848,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14848, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14827, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14843,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14843, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2189,17 +1416,7 @@ static void bobsleigh_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14831, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14847,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14847, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2209,8 +1426,7 @@ static void bobsleigh_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2220,68 +1436,28 @@ static void bobsleigh_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14829, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14845,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14845, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14833, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14849,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14849, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14826, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14842,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14842, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14830, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14846,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14846, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
             }
@@ -2304,11 +1480,7 @@ static void bobsleigh_rc_track_s_bend_left(
 
 /** rct2: 0x006FE754 */
 static void bobsleigh_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2320,68 +1492,28 @@ static void bobsleigh_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14834, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14850,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14850, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14838, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14854,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14854, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14837, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14853,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14853, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14841, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14857,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14857, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
             }
@@ -2401,17 +1533,7 @@ static void bobsleigh_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14835, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14851,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14851, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2420,17 +1542,7 @@ static void bobsleigh_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14839, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14855,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14855, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2439,34 +1551,14 @@ static void bobsleigh_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14836, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14852,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14852, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14840, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14856,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14856, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     break;
             }
@@ -2474,8 +1566,7 @@ static void bobsleigh_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2485,51 +1576,21 @@ static void bobsleigh_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14836, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14852,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14852, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14840, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14856,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14856, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14835, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14851,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14851, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2538,17 +1599,7 @@ static void bobsleigh_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14839, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14855,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14855, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2558,8 +1609,7 @@ static void bobsleigh_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2569,68 +1619,28 @@ static void bobsleigh_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14837, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14853,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14853, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14841, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14857,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14857, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14834, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14850,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14850, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14838, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14854,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14854, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     break;
             }
@@ -2653,11 +1663,7 @@ static void bobsleigh_rc_track_s_bend_right(
 
 /** rct2: 0x006FE794 */
 static void bobsleigh_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2669,68 +1675,28 @@ static void bobsleigh_rc_track_left_quarter_turn_3(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14783, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14795,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14795, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14786, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14798,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14798, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14789, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14801,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14801, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14780, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14792,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14792, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
             }
@@ -2751,103 +1717,33 @@ static void bobsleigh_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14782,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14782, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14794,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14794, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14785, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14797,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14797, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14788,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14788, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14800,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14800, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14779,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14779, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14791,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14791, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
             }
@@ -2862,68 +1758,28 @@ static void bobsleigh_rc_track_left_quarter_turn_3(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14781, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14793,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14793, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14784, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14796,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14796, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14787, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14799,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14799, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14778, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14790,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14790, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
             }
@@ -2946,11 +1802,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x006FE7A4 */
 static void bobsleigh_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -2959,11 +1811,7 @@ static void bobsleigh_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x006FE7B4 */
 static void bobsleigh_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2975,68 +1823,28 @@ static void bobsleigh_rc_track_left_quarter_turn_3_bank(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14807, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14819,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14819, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14810, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14822,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14822, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14813, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14825,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14825, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14804, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14816,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14816, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
             }
@@ -3057,103 +1865,33 @@ static void bobsleigh_rc_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14806,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14806, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14818,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14818, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14809, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14821,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14821, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14812,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14812, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14824,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14824, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14803,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14803, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14815,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14815, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
             }
@@ -3168,68 +1906,28 @@ static void bobsleigh_rc_track_left_quarter_turn_3_bank(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14805, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14817,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14817, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14808, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14820,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14820, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14811, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14823,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14823, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14802, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14814,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14814, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
             }
@@ -3252,11 +1950,7 @@ static void bobsleigh_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x006FE7C4 */
 static void bobsleigh_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3265,11 +1959,7 @@ static void bobsleigh_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x006FE7D4 */
 static void bobsleigh_rc_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3281,68 +1971,28 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14887, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14899,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14899, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14890, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14902,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14902, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14893, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14905,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14905, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14884, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14896,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14896, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
             }
@@ -3352,10 +2002,8 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -3366,103 +2014,33 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14886,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14886, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14898,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14898, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14889, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14901,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14901, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14892,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14892, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14904,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14904, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14883,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14883, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14895,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14895, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
             }
@@ -3477,68 +2055,28 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14885, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14897,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14897, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14888, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14900,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14900, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14891, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14903,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14903, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14882, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14894,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14894, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
             }
@@ -3553,10 +2091,8 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -3566,68 +2102,28 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14884, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14896,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14896, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14887, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14899,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14899, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14890, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14902,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14902, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14893, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14905,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14905, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
             }
@@ -3642,10 +2138,8 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -3656,103 +2150,33 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14883,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14883, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14895,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14895, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14886,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14886, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14898,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14898, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14889, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14901,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14901, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14892,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14892, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14904,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14904, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
             }
@@ -3767,68 +2191,28 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14882, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14894,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14894, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14885, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14897,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14897, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14888, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14900,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14900, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14891, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14903,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14903, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
             }
@@ -3838,10 +2222,8 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -3849,11 +2231,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_small(
 
 /** rct2: 0x006FE7E4 */
 static void bobsleigh_rc_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3865,68 +2243,28 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14858, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14870,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14870, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14861, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14873,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14873, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14864, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14876,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14876, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14867, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14879,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14879, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
             }
@@ -3936,10 +2274,8 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -3950,103 +2286,33 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14859,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14859, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14871,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14871, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14862,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14862, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14874,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14874, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14865, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14877,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14877, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14868,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14868, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14880,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14880, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
             }
@@ -4061,68 +2327,28 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14860, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14872,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14872, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14863, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14875,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14875, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14866, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14878,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14878, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14869, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14881,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14881, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
             }
@@ -4137,10 +2363,8 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -4150,68 +2374,28 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14861, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14873,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14873, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14864, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14876,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14876, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14867, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14879,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14879, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14858, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14870,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14870, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
             }
@@ -4226,10 +2410,8 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -4240,103 +2422,33 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14862,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14862, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14874,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14874, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14865, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14877,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14877, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14868,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14868, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14880,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14880, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14859,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14859, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14871,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14871, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
             }
@@ -4351,68 +2463,28 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14863, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14875,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14875, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14866, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14878,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14878, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14869, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14881,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14881, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14860, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14872,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14872, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
             }
@@ -4422,10 +2494,8 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -4433,11 +2503,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_small(
 
 /** rct2: 0x006FE7F4 */
 static void bobsleigh_rc_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -4452,11 +2518,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_down_small(
 
 /** rct2: 0x006FE804 */
 static void bobsleigh_rc_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -4471,11 +2533,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_down_small(
 
 /** rct2: 0x006FE814 */
 static void bobsleigh_rc_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4487,68 +2545,28 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14955, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14975,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14975, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14960, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14980,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14980, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14965, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14985,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14985, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14950, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14970,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14970, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
             }
@@ -4558,10 +2576,8 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -4574,90 +2590,30 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14954, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14974,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14974, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14959, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14979,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14979, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14964,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14964, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14984,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14984, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14949,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14949, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14969,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14969, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     break;
             }
@@ -4665,8 +2621,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -4674,103 +2629,33 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14953,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14953, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14973,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14973, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14958,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14958, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14978,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14978, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14963,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14963, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14983,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14983, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14948, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14968,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14968, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
             }
@@ -4786,92 +2671,32 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14952,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14952, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14972,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14972, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14957, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14977,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14977, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14962, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14982,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14982, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14947,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14947, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14967,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14967, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     break;
             }
@@ -4879,8 +2704,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -4890,68 +2714,28 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14951, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14971,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14971, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14956, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14976,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14976, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14961, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14981,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14981, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14946, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14966,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14966, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
             }
@@ -4966,10 +2750,8 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -4979,68 +2761,28 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14950, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14970,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14970, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14955, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14975,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14975, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14960, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14980,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14980, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14965, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14985,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14985, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
             }
@@ -5055,10 +2797,8 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -5069,92 +2809,32 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14949,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14949, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14969,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14969, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14954, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14974,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14974, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14959, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14979,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14979, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14964,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14964, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14984,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14984, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     break;
             }
@@ -5162,8 +2842,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -5173,101 +2852,31 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14948, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14968,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14968, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14953,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14953, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14973,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14973, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14958,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14958, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14978,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14978, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14963,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14963, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14983,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14983, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
             }
@@ -5283,92 +2892,32 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14947,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14947, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14967,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14967, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14952,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14952, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14972,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14972, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14957, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14977,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14977, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14962, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14982,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14982, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     break;
             }
@@ -5376,8 +2925,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -5387,68 +2935,28 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14946, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14966,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14966, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14951, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14971,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14971, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14956, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14976,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14976, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14961, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14981,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14981, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
             }
@@ -5458,10 +2966,8 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -5469,11 +2975,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_up_large(
 
 /** rct2: 0x006FE824 */
 static void bobsleigh_rc_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5485,68 +2987,28 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14906, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14926,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14926, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14911, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14931,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14931, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14916, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14936,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14936, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14921, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14941,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14941, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
             }
@@ -5556,10 +3018,8 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -5570,92 +3030,32 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14907,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14907, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14927,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14927, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14912,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14912, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14932,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14932, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14917, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14937,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14937, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14922, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14942,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14942, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     break;
             }
@@ -5663,8 +3063,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -5674,101 +3073,31 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14908, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14928,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14928, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14913,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14913, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14933,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14933, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14918,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14918, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14938,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14938, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14923,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14923, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14943,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14943, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
             }
@@ -5784,92 +3113,32 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14909,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14909, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14929,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14929, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14914, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14934,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14934, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14919, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14939,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14939, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14924,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14924, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14944,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14944, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     break;
             }
@@ -5877,8 +3146,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -5888,68 +3156,28 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14910, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14930,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14930, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14915, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14935,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14935, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14920, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14940,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14940, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14925, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14945,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14945, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
             }
@@ -5964,10 +3192,8 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -5977,68 +3203,28 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14911, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14931,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14931, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14916, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14936,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14936, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14921, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14941,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14941, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14906, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14926,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14926, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     break;
             }
@@ -6053,10 +3239,8 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -6067,92 +3251,32 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14912,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14912, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14932,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14932, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14917, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14937,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14937, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14922, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14942,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14942, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14907,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14907, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14927,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14927, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     break;
             }
@@ -6160,8 +3284,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -6169,103 +3292,33 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14913,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14913, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14933,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14933, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14918,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14918, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14938,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14938, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14923,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14923, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14943,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14943, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14908, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14928,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14928, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
             }
@@ -6283,90 +3336,30 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14914, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14934,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14934, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14919, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14939,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14939, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14924,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14924, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14944,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14944, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14909,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14909, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14929,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14929, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     break;
             }
@@ -6374,8 +3367,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -6385,68 +3377,28 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14915, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14935,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14935, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14920, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14940,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14940, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14925, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14945,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14945, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 14910, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 14930,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 14930, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     break;
             }
@@ -6456,10 +3408,8 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -6467,11 +3417,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_up_large(
 
 /** rct2: 0x006FE834 */
 static void bobsleigh_rc_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -6486,11 +3432,7 @@ static void bobsleigh_rc_track_left_half_banked_helix_down_large(
 
 /** rct2: 0x006FE844 */
 static void bobsleigh_rc_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -6505,11 +3447,7 @@ static void bobsleigh_rc_track_right_half_banked_helix_down_large(
 
 /** rct2: 0x006FE854 */
 static void bobsleigh_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -6541,11 +3479,7 @@ static void bobsleigh_rc_track_brakes(
 
 /** rct2: 0x006FE864 */
 static void bobsleigh_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -6576,11 +3510,7 @@ static void bobsleigh_rc_track_block_brakes(
 }
 
 static void bobsleigh_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp
index f112c42ceb..992cf906a9 100644
--- a/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp
+++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.cpp
@@ -22,13 +22,8 @@
 #include "../TrackPaint.h"
 
 void bolliger_mabillard_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     if (track_element_is_lift_hill(tileElement))
     {
@@ -83,13 +78,8 @@ void bolliger_mabillard_track_flat(
 }
 
 void bolliger_mabillard_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     static constexpr const uint32_t imageIds[4][3] = {
         { 17154, 17150, SPR_STATION_BASE_A_SW_NE },
@@ -101,33 +91,13 @@ void bolliger_mabillard_track_station(
     if (track_element_get_type(tileElement) == TRACK_ELEM_END_STATION)
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            1,
-            height,
-            0,
-            6,
+            session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
             height + 3);
     }
     else
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            1,
-            height,
-            0,
-            6,
+            session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
             height + 3);
     }
     sub_98196C_rotated(
@@ -144,13 +114,8 @@ void bolliger_mabillard_track_station(
 }
 
 void bolliger_mabillard_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     if (track_element_is_lift_hill(tileElement))
     {
@@ -218,13 +183,8 @@ void bolliger_mabillard_track_25_deg_up(
 }
 
 void bolliger_mabillard_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     if (track_element_is_lift_hill(tileElement))
     {
@@ -292,13 +252,8 @@ void bolliger_mabillard_track_60_deg_up(
 }
 
 void bolliger_mabillard_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     if (track_element_is_lift_hill(tileElement))
     {
@@ -366,13 +321,8 @@ void bolliger_mabillard_track_flat_to_25_deg_up(
 }
 
 void bolliger_mabillard_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     if (track_element_is_lift_hill(tileElement))
     {
@@ -448,13 +398,8 @@ void bolliger_mabillard_track_25_deg_up_to_60_deg_up(
 }
 
 void bolliger_mabillard_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     if (track_element_is_lift_hill(tileElement))
     {
@@ -530,13 +475,8 @@ void bolliger_mabillard_track_60_deg_up_to_25_deg_up(
 }
 
 void bolliger_mabillard_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     if (track_element_is_lift_hill(tileElement))
     {
@@ -604,91 +544,56 @@ void bolliger_mabillard_track_25_deg_up_to_flat(
 }
 
 void bolliger_mabillard_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_25_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_60_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_25_deg_up_to_flat(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_60_deg_up_to_25_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_25_deg_up_to_60_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_flat_to_25_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -737,32 +642,12 @@ void bolliger_mabillard_track_left_quarter_turn_5(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17268,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17268, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17253,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17253, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -770,8 +655,7 @@ void bolliger_mabillard_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -779,47 +663,17 @@ void bolliger_mabillard_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17257,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17257, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17262,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17262, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17267,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17267, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -839,17 +693,7 @@ void bolliger_mabillard_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17256,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17256, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -862,17 +706,7 @@ void bolliger_mabillard_track_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17251,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17251, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -880,8 +714,7 @@ void bolliger_mabillard_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -922,13 +755,8 @@ void bolliger_mabillard_track_left_quarter_turn_5(
 }
 
 void bolliger_mabillard_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
     bolliger_mabillard_track_left_quarter_turn_5(
@@ -936,13 +764,8 @@ void bolliger_mabillard_track_right_quarter_turn_5(
 }
 
 void bolliger_mabillard_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -978,13 +801,8 @@ void bolliger_mabillard_track_flat_to_left_bank(
 }
 
 void bolliger_mabillard_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -1020,13 +838,8 @@ void bolliger_mabillard_track_flat_to_right_bank(
 }
 
 void bolliger_mabillard_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -1062,13 +875,8 @@ void bolliger_mabillard_track_left_bank_to_flat(
 }
 
 void bolliger_mabillard_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -1104,13 +912,8 @@ void bolliger_mabillard_track_right_bank_to_flat(
 }
 
 void bolliger_mabillard_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -1121,33 +924,13 @@ void bolliger_mabillard_track_banked_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17279, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17290,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17290, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17284,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17284, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -1181,48 +964,18 @@ void bolliger_mabillard_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17283,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17283, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     metal_a_supports_paint_setup(session, supportType, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17288,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17288, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17273,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17273, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -1230,8 +983,7 @@ void bolliger_mabillard_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -1239,47 +991,17 @@ void bolliger_mabillard_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17277,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17277, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17282,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17282, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17287,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17287, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -1299,32 +1021,12 @@ void bolliger_mabillard_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17276,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17276, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17281,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17281, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -1333,17 +1035,7 @@ void bolliger_mabillard_track_banked_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17271,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17271, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -1351,8 +1043,7 @@ void bolliger_mabillard_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -1364,34 +1055,14 @@ void bolliger_mabillard_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17280,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17280, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17285, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17291,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17291, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -1417,13 +1088,8 @@ void bolliger_mabillard_track_banked_left_quarter_turn_5(
 }
 
 void bolliger_mabillard_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
     bolliger_mabillard_track_banked_left_quarter_turn_5(
@@ -1431,13 +1097,8 @@ void bolliger_mabillard_track_banked_right_quarter_turn_5(
 }
 
 void bolliger_mabillard_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -1480,13 +1141,8 @@ void bolliger_mabillard_track_left_bank_to_25_deg_up(
 }
 
 void bolliger_mabillard_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -1529,13 +1185,8 @@ void bolliger_mabillard_track_right_bank_to_25_deg_up(
 }
 
 void bolliger_mabillard_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -1578,13 +1229,8 @@ void bolliger_mabillard_track_25_deg_up_to_left_bank(
 }
 
 void bolliger_mabillard_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -1627,65 +1273,40 @@ void bolliger_mabillard_track_25_deg_up_to_right_bank(
 }
 
 void bolliger_mabillard_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_25_deg_up_to_right_bank(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_25_deg_up_to_left_bank(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_right_bank_to_25_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_left_bank_to_25_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -1717,26 +1338,16 @@ void bolliger_mabillard_track_left_bank(
 }
 
 void bolliger_mabillard_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_left_bank(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -1785,32 +1396,12 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17355,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17355, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17360,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17360, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -1818,8 +1409,7 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -1827,47 +1417,17 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17346,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17346, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17351,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17351, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17356,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17356, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -1887,17 +1447,7 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17347,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17347, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -1910,17 +1460,7 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17362,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17362, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -1928,8 +1468,7 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -1970,13 +1509,8 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(
 }
 
 void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -2017,32 +1551,12 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17325,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17325, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17330,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17330, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -2058,8 +1572,7 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -2071,47 +1584,17 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17331,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17331, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17336,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17336, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17341,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17341, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -2127,17 +1610,7 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17327,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17327, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -2150,17 +1623,7 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17342,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17342, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -2168,8 +1631,7 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -2210,13 +1672,8 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(
 }
 
 void bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
     bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(
@@ -2224,13 +1681,8 @@ void bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(
 }
 
 void bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
     bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(
@@ -2238,13 +1690,8 @@ void bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(
 }
 
 void bolliger_mabillard_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -2303,8 +1750,7 @@ void bolliger_mabillard_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2333,8 +1779,7 @@ void bolliger_mabillard_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2375,13 +1820,8 @@ void bolliger_mabillard_track_s_bend_left(
 }
 
 void bolliger_mabillard_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -2440,8 +1880,7 @@ void bolliger_mabillard_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2470,8 +1909,7 @@ void bolliger_mabillard_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2512,13 +1950,8 @@ void bolliger_mabillard_track_s_bend_right(
 }
 
 void bolliger_mabillard_track_left_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -2554,8 +1987,7 @@ void bolliger_mabillard_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 56, 0x20);
             break;
         case 1:
@@ -2586,8 +2018,7 @@ void bolliger_mabillard_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 2:
@@ -2595,62 +2026,22 @@ void bolliger_mabillard_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17596,
-                        16,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17596, 16, 0, 3, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17604,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17604, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17599,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17599, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17607,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17607, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
             }
@@ -2682,8 +2073,7 @@ void bolliger_mabillard_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 4:
@@ -2716,8 +2106,7 @@ void bolliger_mabillard_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 7:
@@ -2725,62 +2114,22 @@ void bolliger_mabillard_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17599,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17599, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17607,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17607, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17596,
-                        16,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17596, 16, 0, 3, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17604,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17604, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
             }
@@ -2816,8 +2165,7 @@ void bolliger_mabillard_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 9:
@@ -2857,21 +2205,15 @@ void bolliger_mabillard_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 56, 0x20);
             break;
     }
 }
 
 void bolliger_mabillard_track_right_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -2933,62 +2275,22 @@ void bolliger_mabillard_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17623,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17623, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17615,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17615, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17620,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17620, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17612,
-                        16,
-                        0,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17612, 16, 0, 2, 16, 119, height, 16, 0,
                         height);
                     break;
             }
@@ -3049,62 +2351,22 @@ void bolliger_mabillard_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17620,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17620, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17612,
-                        16,
-                        0,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17612, 16, 0, 2, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17623,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17623, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17615,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17615, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
             }
@@ -3174,13 +2436,8 @@ void bolliger_mabillard_track_right_vertical_loop(
 }
 
 void bolliger_mabillard_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -3221,17 +2478,7 @@ void bolliger_mabillard_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17228,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17228, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -3240,32 +2487,12 @@ void bolliger_mabillard_track_left_quarter_turn_3(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17234,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17234, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17225,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17225, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -3311,13 +2538,8 @@ void bolliger_mabillard_track_left_quarter_turn_3(
 }
 
 void bolliger_mabillard_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
     bolliger_mabillard_track_left_quarter_turn_3(
@@ -3325,13 +2547,8 @@ void bolliger_mabillard_track_right_quarter_turn_3(
 }
 
 void bolliger_mabillard_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -3342,32 +2559,12 @@ void bolliger_mabillard_track_left_quarter_turn_3_bank(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17241, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17248,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17248, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17244,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17244, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -3396,62 +2593,22 @@ void bolliger_mabillard_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17240,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17240, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17243,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17243, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17246,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17246, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17237,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17237, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -3468,34 +2625,14 @@ void bolliger_mabillard_track_left_quarter_turn_3_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17242,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17242, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17245, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17249,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17249, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -3521,13 +2658,8 @@ void bolliger_mabillard_track_left_quarter_turn_3_bank(
 }
 
 void bolliger_mabillard_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
     bolliger_mabillard_track_left_quarter_turn_3_bank(
@@ -3535,13 +2667,8 @@ void bolliger_mabillard_track_right_quarter_turn_3_bank(
 }
 
 void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -3618,13 +2745,8 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(
 }
 
 void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -3704,13 +2826,8 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(
 }
 
 void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
     bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(
@@ -3718,13 +2835,8 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(
 }
 
 void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
     bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(
@@ -3732,13 +2844,8 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(
 }
 
 void bolliger_mabillard_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -3749,32 +2856,12 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17399, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17406,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17406, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17402,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17402, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -3792,10 +2879,8 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -3806,62 +2891,22 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17398,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17398, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17401,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17401, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17404,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17404, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17395,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17395, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -3878,34 +2923,14 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17400,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17400, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17403, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17407,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17407, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -3924,10 +2949,8 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -3941,32 +2964,12 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17399, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17406,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17406, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17402,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17402, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -3985,10 +2988,8 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -3999,62 +3000,22 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17395,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17395, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17398,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17398, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17401,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17401, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17404,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17404, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4075,34 +3036,14 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17400,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17400, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17403, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17407,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17407, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -4112,23 +3053,16 @@ void bolliger_mabillard_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
 }
 
 void bolliger_mabillard_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -4145,34 +3079,14 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17386,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17386, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17389, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17393,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17393, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -4182,10 +3096,8 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -4196,62 +3108,22 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17381,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17381, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17384,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17384, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17387,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17387, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17390,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17390, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4270,32 +3142,12 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17385, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17392,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17392, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17388,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17388, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4314,10 +3166,8 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -4329,34 +3179,14 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17386,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17386, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17389, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17393,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17393, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4375,10 +3205,8 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -4389,62 +3217,22 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17384,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17384, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17387,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17387, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17390,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17390, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17381,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17381, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -4459,32 +3247,12 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17385, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17392,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17392, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17388,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17388, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -4502,23 +3270,16 @@ void bolliger_mabillard_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
 }
 
 void bolliger_mabillard_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     if (trackSequence >= 4)
     {
@@ -4531,13 +3292,8 @@ void bolliger_mabillard_track_left_half_banked_helix_down_small(
 }
 
 void bolliger_mabillard_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     if (trackSequence >= 4)
     {
@@ -4550,13 +3306,8 @@ void bolliger_mabillard_track_right_half_banked_helix_down_small(
 }
 
 void bolliger_mabillard_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -4567,32 +3318,12 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17439, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17450,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17450, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17444,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17444, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -4610,10 +3341,8 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -4628,47 +3357,17 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17443,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17443, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17448,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17448, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17433,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17433, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -4676,8 +3375,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -4685,47 +3383,17 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17437,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17437, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17442,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17442, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17447,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17447, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -4745,32 +3413,12 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17436,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17436, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17441,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17441, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -4779,17 +3427,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17431,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17431, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4797,8 +3435,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -4810,34 +3447,14 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17440,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17440, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17445, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17451,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17451, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4856,10 +3473,8 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -4873,32 +3488,12 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17439, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17450,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17450, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17444,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17444, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4917,10 +3512,8 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -4931,17 +3524,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17433,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17433, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -4950,32 +3533,12 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17443,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17443, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17448,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17448, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4983,8 +3546,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -4996,47 +3558,17 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17437,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17437, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17442,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17442, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17447,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17447, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5052,47 +3584,17 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17431,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17431, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17436,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17436, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17441,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17441, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -5104,8 +3606,7 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -5121,34 +3622,14 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17440,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17440, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17445, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17451,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17451, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -5158,23 +3639,16 @@ void bolliger_mabillard_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
 }
 
 void bolliger_mabillard_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -5191,34 +3665,14 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17418,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17418, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17423, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17429,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17429, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -5228,10 +3682,8 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -5242,47 +3694,17 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17409,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17409, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17414,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17414, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17419,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17419, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -5294,8 +3716,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -5307,47 +3728,17 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17415,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17415, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17420,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17420, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17425,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17425, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5363,17 +3754,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17411,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17411, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -5382,32 +3763,12 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17421,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17421, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17426,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17426, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -5415,8 +3776,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -5431,33 +3791,13 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17417, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17428,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17428, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 4, 3, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17422,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17422, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -5477,10 +3817,8 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -5492,34 +3830,14 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17418,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17418, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17423, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17429,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17429, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -5538,10 +3856,8 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -5552,32 +3868,12 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17414,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17414, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17419,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17419, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -5586,17 +3882,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17409,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17409, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -5604,8 +3890,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -5613,47 +3898,17 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17415,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17415, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17420,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17420, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17425,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17425, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -5677,47 +3932,17 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17421,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17421, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17426,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17426, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17411,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17411, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5725,8 +3950,7 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -5736,33 +3960,13 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17417, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17428,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17428, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 4, 3, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17422,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17422, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -5782,23 +3986,16 @@ void bolliger_mabillard_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
 }
 
 void bolliger_mabillard_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     if (trackSequence >= 7)
     {
@@ -5811,13 +4008,8 @@ void bolliger_mabillard_track_left_half_banked_helix_down_large(
 }
 
 void bolliger_mabillard_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     if (trackSequence >= 7)
     {
@@ -5830,13 +4022,8 @@ void bolliger_mabillard_track_right_half_banked_helix_down_large(
 }
 
 void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -5871,13 +4058,8 @@ void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(
 }
 
 void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -5912,39 +4094,24 @@ void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(
 }
 
 void bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(
         session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(
         session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -5970,13 +4137,8 @@ void bolliger_mabillard_track_brakes(
 }
 
 void bolliger_mabillard_track_25_deg_up_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -6015,13 +4177,8 @@ void bolliger_mabillard_track_25_deg_up_left_banked(
 }
 
 void bolliger_mabillard_track_25_deg_up_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -6060,13 +4217,8 @@ void bolliger_mabillard_track_25_deg_up_right_banked(
 }
 
 void bolliger_mabillard_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -6106,39 +4258,24 @@ void bolliger_mabillard_track_on_ride_photo(
 }
 
 void bolliger_mabillard_track_25_deg_down_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_25_deg_up_right_banked(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_25_deg_down_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_25_deg_up_left_banked(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -6147,62 +4284,22 @@ void bolliger_mabillard_track_90_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17526,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17526, 0, 0, 2, 20, 31, height, 4, 6,
                         height + 8);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17527,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17527, 0, 0, 2, 20, 31, height, 24, 6,
                         height + 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17528,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17528, 0, 0, 2, 20, 31, height, 24, 6,
                         height + 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17529,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17529, 0, 0, 2, 20, 31, height, 4, 6,
                         height + 8);
                     break;
             }
@@ -6217,26 +4314,16 @@ void bolliger_mabillard_track_90_deg_up(
 }
 
 void bolliger_mabillard_track_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_90_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_60_deg_up_to_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -6249,32 +4336,12 @@ void bolliger_mabillard_track_60_deg_up_to_90_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17519,
-                        0,
-                        0,
-                        2,
-                        20,
-                        55,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17519, 0, 0, 2, 20, 55, height, 24, 6,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17520,
-                        0,
-                        0,
-                        2,
-                        20,
-                        55,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17520, 0, 0, 2, 20, 55, height, 24, 6,
                         height);
                     break;
                 case 3:
@@ -6297,26 +4364,16 @@ void bolliger_mabillard_track_60_deg_up_to_90_deg_up(
 }
 
 void bolliger_mabillard_track_90_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_60_deg_up_to_90_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_90_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -6352,13 +4409,8 @@ void bolliger_mabillard_track_90_deg_up_to_60_deg_up(
 }
 
 void bolliger_mabillard_track_60_deg_down_to_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -6367,62 +4419,22 @@ void bolliger_mabillard_track_60_deg_down_to_90_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17524,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17524, 0, 0, 2, 20, 31, height, 24, 6,
                         height + 8);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17525,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17525, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17522,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17522, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17523,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17523, 0, 0, 2, 20, 31, height, 24, 6,
                         height + 8);
                     break;
             }
@@ -6440,13 +4452,8 @@ void bolliger_mabillard_track_60_deg_down_to_90_deg_down(
 }
 
 void bolliger_mabillard_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -6492,32 +4499,12 @@ void bolliger_mabillard_track_left_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17555,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17555, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17559,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17559, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -6525,8 +4512,7 @@ void bolliger_mabillard_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -6534,47 +4520,17 @@ void bolliger_mabillard_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17548,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17548, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17552,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17552, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17556,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17556, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -6583,10 +4539,8 @@ void bolliger_mabillard_track_left_eighth_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -6599,33 +4553,13 @@ void bolliger_mabillard_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17549,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17549, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17553,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17553, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -6636,17 +4570,7 @@ void bolliger_mabillard_track_left_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17561,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17561, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -6655,21 +4579,15 @@ void bolliger_mabillard_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
 }
 
 void bolliger_mabillard_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -6707,32 +4625,12 @@ void bolliger_mabillard_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17531,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17531, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17535,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17535, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -6748,8 +4646,7 @@ void bolliger_mabillard_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -6761,17 +4658,7 @@ void bolliger_mabillard_track_right_eighth_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17536,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17536, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
@@ -6780,25 +4667,13 @@ void bolliger_mabillard_track_right_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17544,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17544, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -6811,17 +4686,7 @@ void bolliger_mabillard_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17533,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17533, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -6832,33 +4697,13 @@ void bolliger_mabillard_track_right_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17541,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17541, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17545,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17545, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -6867,21 +4712,15 @@ void bolliger_mabillard_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
 }
 
 void bolliger_mabillard_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
     bolliger_mabillard_track_right_eighth_to_diag(
@@ -6889,13 +4728,8 @@ void bolliger_mabillard_track_left_eighth_to_orthogonal(
 }
 
 void bolliger_mabillard_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
     bolliger_mabillard_track_left_eighth_to_diag(
@@ -6903,13 +4737,8 @@ void bolliger_mabillard_track_right_eighth_to_orthogonal(
 }
 
 void bolliger_mabillard_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -6918,32 +4747,12 @@ void bolliger_mabillard_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17578,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17578, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17582,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17582, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -6973,47 +4782,17 @@ void bolliger_mabillard_track_left_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17583,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17583, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17587,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17587, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17591,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17591, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -7021,8 +4800,7 @@ void bolliger_mabillard_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -7030,47 +4808,17 @@ void bolliger_mabillard_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17580,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17580, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17584,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17584, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17588,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17588, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -7079,10 +4827,8 @@ void bolliger_mabillard_track_left_eighth_bank_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -7095,33 +4841,13 @@ void bolliger_mabillard_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17581,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17581, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17585,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17585, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     metal_a_supports_paint_setup(session, supportType, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -7132,17 +4858,7 @@ void bolliger_mabillard_track_left_eighth_bank_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17593,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17593, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -7151,21 +4867,15 @@ void bolliger_mabillard_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
 }
 
 void bolliger_mabillard_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -7182,32 +4892,12 @@ void bolliger_mabillard_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17570,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17570, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17574,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17574, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -7225,47 +4915,17 @@ void bolliger_mabillard_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17563,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17563, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17567,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17567, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17571,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17571, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -7277,8 +4937,7 @@ void bolliger_mabillard_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -7290,55 +4949,23 @@ void bolliger_mabillard_track_right_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17568,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17568, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17572,
-                        0,
-                        0,
-                        28,
-                        28,
-                        0,
-                        height,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17572, 0, 0, 28, 28, 0, height, 4, 4,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17576,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17576, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -7351,17 +4978,7 @@ void bolliger_mabillard_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17565,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17565, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -7372,33 +4989,13 @@ void bolliger_mabillard_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17573,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17573, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     metal_a_supports_paint_setup(session, supportType, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17577,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17577, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -7407,21 +5004,15 @@ void bolliger_mabillard_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
 }
 
 void bolliger_mabillard_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
     bolliger_mabillard_track_right_eighth_bank_to_diag(
@@ -7429,13 +5020,8 @@ void bolliger_mabillard_track_left_eighth_bank_to_orthogonal(
 }
 
 void bolliger_mabillard_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
     bolliger_mabillard_track_left_eighth_bank_to_diag(
@@ -7443,13 +5029,8 @@ void bolliger_mabillard_track_right_eighth_bank_to_orthogonal(
 }
 
 void bolliger_mabillard_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -7460,18 +5041,8 @@ void bolliger_mabillard_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17861,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17861, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7481,18 +5052,8 @@ void bolliger_mabillard_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17791,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17791, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7507,18 +5068,8 @@ void bolliger_mabillard_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17858,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17858, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7528,18 +5079,8 @@ void bolliger_mabillard_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17788,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17788, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7554,18 +5095,8 @@ void bolliger_mabillard_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17860,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17860, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7575,18 +5106,8 @@ void bolliger_mabillard_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17790,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17790, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7605,18 +5126,8 @@ void bolliger_mabillard_track_diag_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17859,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17859, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7640,18 +5151,8 @@ void bolliger_mabillard_track_diag_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17789,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17789, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7673,13 +5174,8 @@ void bolliger_mabillard_track_diag_flat(
 }
 
 void bolliger_mabillard_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -7690,18 +5186,8 @@ void bolliger_mabillard_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17873,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17873, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7711,18 +5197,8 @@ void bolliger_mabillard_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17803,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17803, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7737,18 +5213,8 @@ void bolliger_mabillard_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17870,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17870, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7758,18 +5224,8 @@ void bolliger_mabillard_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17800,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17800, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7784,18 +5240,8 @@ void bolliger_mabillard_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17872,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17872, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7805,18 +5251,8 @@ void bolliger_mabillard_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17802,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17802, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7835,18 +5271,8 @@ void bolliger_mabillard_track_diag_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17871,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17871, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7870,18 +5296,8 @@ void bolliger_mabillard_track_diag_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17801,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17801, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7903,13 +5319,8 @@ void bolliger_mabillard_track_diag_25_deg_up(
 }
 
 void bolliger_mabillard_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -7920,18 +5331,8 @@ void bolliger_mabillard_track_diag_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17885,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17885, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7941,18 +5342,8 @@ void bolliger_mabillard_track_diag_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17815,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17815, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7967,18 +5358,8 @@ void bolliger_mabillard_track_diag_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17882,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17882, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7988,18 +5369,8 @@ void bolliger_mabillard_track_diag_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17812,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17812, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8014,18 +5385,8 @@ void bolliger_mabillard_track_diag_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17884,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17884, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8035,18 +5396,8 @@ void bolliger_mabillard_track_diag_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17814,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17814, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8065,18 +5416,8 @@ void bolliger_mabillard_track_diag_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17883,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17883, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 36, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8100,18 +5441,8 @@ void bolliger_mabillard_track_diag_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17813,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17813, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 36, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8133,13 +5464,8 @@ void bolliger_mabillard_track_diag_60_deg_up(
 }
 
 void bolliger_mabillard_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -8150,18 +5476,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17865,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17865, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8171,18 +5487,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17795,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17795, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8197,18 +5503,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17862,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17862, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8218,18 +5514,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17792,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17792, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8244,18 +5530,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17864,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17864, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8265,18 +5541,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17794,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17794, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8295,18 +5561,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17863,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17863, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8330,18 +5586,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17793,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17793, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8363,13 +5609,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_up(
 }
 
 void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -8380,18 +5621,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17877,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17877, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8401,18 +5632,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17807,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17807, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8427,18 +5648,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17874,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17874, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8448,18 +5659,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17804,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17804, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8474,18 +5675,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17876,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17876, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8495,18 +5686,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17806,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17806, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8525,18 +5706,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17875,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17875, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8560,18 +5731,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17805,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17805, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8593,13 +5754,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(
 }
 
 void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -8610,18 +5766,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17881,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17881, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8631,18 +5777,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17811,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17811, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8657,18 +5793,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17878,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17878, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8678,18 +5804,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17808,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17808, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8704,18 +5820,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17880,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17880, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8725,18 +5831,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17810,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17810, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8755,17 +5851,7 @@ void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17879,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17879, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 21, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8790,17 +5876,7 @@ void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17809,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17809, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 21, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8823,13 +5899,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(
 }
 
 void bolliger_mabillard_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -8840,18 +5911,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17869,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17869, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8861,18 +5922,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17799,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17799, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8887,18 +5938,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17866,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17866, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8908,18 +5949,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17796,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17796, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8934,18 +5965,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17868,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17868, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8955,18 +5976,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17798,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17798, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8985,18 +5996,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17867,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17867, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9020,18 +6021,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17797,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17797, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9053,13 +6044,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_flat(
 }
 
 void bolliger_mabillard_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -9070,18 +6056,8 @@ void bolliger_mabillard_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17871,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17871, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9091,18 +6067,8 @@ void bolliger_mabillard_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17801,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17801, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9117,18 +6083,8 @@ void bolliger_mabillard_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17872,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17872, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9138,18 +6094,8 @@ void bolliger_mabillard_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17802,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17802, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9164,18 +6110,8 @@ void bolliger_mabillard_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17870,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17870, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9185,18 +6121,8 @@ void bolliger_mabillard_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17800,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17800, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9215,18 +6141,8 @@ void bolliger_mabillard_track_diag_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17873,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17873, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9250,18 +6166,8 @@ void bolliger_mabillard_track_diag_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17803,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17803, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9283,13 +6189,8 @@ void bolliger_mabillard_track_diag_25_deg_down(
 }
 
 void bolliger_mabillard_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -9300,18 +6201,8 @@ void bolliger_mabillard_track_diag_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17883,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17883, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9321,18 +6212,8 @@ void bolliger_mabillard_track_diag_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17813,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17813, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9347,18 +6228,8 @@ void bolliger_mabillard_track_diag_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17884,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17884, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9368,18 +6239,8 @@ void bolliger_mabillard_track_diag_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17814,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17814, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9394,18 +6255,8 @@ void bolliger_mabillard_track_diag_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17882,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17882, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9415,18 +6266,8 @@ void bolliger_mabillard_track_diag_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17812,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17812, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9445,18 +6286,8 @@ void bolliger_mabillard_track_diag_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17885,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17885, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 28, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9480,18 +6311,8 @@ void bolliger_mabillard_track_diag_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17815,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17815, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 28, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9513,13 +6334,8 @@ void bolliger_mabillard_track_diag_60_deg_down(
 }
 
 void bolliger_mabillard_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -9530,18 +6346,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17867,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17867, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9551,18 +6357,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17797,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17797, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9576,18 +6372,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17868,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17868, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9597,18 +6383,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17798,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17798, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9622,18 +6398,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17866,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17866, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9643,18 +6409,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17796,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17796, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9672,18 +6428,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17869,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17869, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9707,18 +6453,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17799,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17799, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9741,13 +6477,8 @@ void bolliger_mabillard_track_diag_flat_to_25_deg_down(
 }
 
 void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -9758,17 +6489,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17879,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17879, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
@@ -9779,17 +6500,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17809,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17809, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
@@ -9805,18 +6516,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17880,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17880, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9826,18 +6527,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17810,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17810, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9852,18 +6543,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17878,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17878, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9873,18 +6554,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17808,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17808, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9903,18 +6574,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17881,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17881, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 17, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9938,18 +6599,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17811,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17811, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 17, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9971,13 +6622,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(
 }
 
 void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -9988,18 +6634,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17875,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17875, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10009,18 +6645,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17805,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17805, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10035,18 +6661,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17876,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17876, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10056,18 +6672,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17806,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17806, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10082,18 +6688,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17874,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17874, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10103,18 +6699,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17804,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17804, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10133,18 +6719,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17877,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17877, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10168,18 +6744,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17807,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17807, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10201,13 +6767,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(
 }
 
 void bolliger_mabillard_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -10218,18 +6779,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17863,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17863, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10239,18 +6790,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17793,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17793, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10265,18 +6806,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17864,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17864, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10286,18 +6817,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17794,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17794, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10312,18 +6833,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17862,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17862, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10333,18 +6844,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17792,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17792, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10363,18 +6864,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17865,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17865, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10398,18 +6889,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17795,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17795, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10431,13 +6912,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_flat(
 }
 
 void bolliger_mabillard_track_diag_flat_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -10448,18 +6924,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17889,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17889, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10469,18 +6935,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17819,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17819, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10495,18 +6951,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17886,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17886, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10516,18 +6962,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17816,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17816, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10542,18 +6978,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17888,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17888, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10563,18 +6989,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17818,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17818, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10593,18 +7009,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17887,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17887, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10628,18 +7034,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17817,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17817, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10661,13 +7057,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_up(
 }
 
 void bolliger_mabillard_track_diag_60_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -10678,18 +7069,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17893,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17893, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10699,18 +7080,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17823,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17823, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10725,18 +7096,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17890,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17890, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10746,18 +7107,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17820,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17820, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10772,18 +7123,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17892,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17892, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10793,18 +7134,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17822,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17822, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10823,18 +7154,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17891,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17891, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10858,18 +7179,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17821,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17821, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10891,13 +7202,8 @@ void bolliger_mabillard_track_diag_60_deg_up_to_flat(
 }
 
 void bolliger_mabillard_track_diag_flat_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -10908,18 +7214,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17891,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17891, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10929,18 +7225,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17821,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17821, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10955,18 +7241,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17892,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17892, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10976,18 +7252,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17822,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17822, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -11002,18 +7268,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17890,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17890, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -11023,18 +7279,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17820,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17820, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -11053,18 +7299,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17893,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17893, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -11088,18 +7324,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17823,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17823, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -11121,13 +7347,8 @@ void bolliger_mabillard_track_diag_flat_to_60_deg_down(
 }
 
 void bolliger_mabillard_track_diag_60_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -11138,18 +7359,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17887,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17887, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -11159,18 +7370,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17817,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17817, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -11185,18 +7386,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17888,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17888, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -11206,18 +7397,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17818,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17818, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -11232,18 +7413,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17886,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17886, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -11253,18 +7424,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17816,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17816, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -11283,18 +7444,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17889,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17889, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -11318,18 +7469,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17819,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            4,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17819, -16, -16, 32, 32, 4, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, supportType, 0, 5, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -11351,13 +7492,8 @@ void bolliger_mabillard_track_diag_60_deg_down_to_flat(
 }
 
 void bolliger_mabillard_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -11366,17 +7502,7 @@ void bolliger_mabillard_track_diag_flat_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17831,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17831, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11389,30 +7515,10 @@ void bolliger_mabillard_track_diag_flat_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17828,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17828, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17832,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17832, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -11425,17 +7531,7 @@ void bolliger_mabillard_track_diag_flat_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17830,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17830, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11451,17 +7547,7 @@ void bolliger_mabillard_track_diag_flat_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17829,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17829, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -11480,13 +7566,8 @@ void bolliger_mabillard_track_diag_flat_to_left_bank(
 }
 
 void bolliger_mabillard_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -11495,17 +7576,7 @@ void bolliger_mabillard_track_diag_flat_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17836,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17836, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11518,17 +7589,7 @@ void bolliger_mabillard_track_diag_flat_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17833,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17833, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11541,30 +7602,10 @@ void bolliger_mabillard_track_diag_flat_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17835,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17835, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17837,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17837, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -11580,17 +7621,7 @@ void bolliger_mabillard_track_diag_flat_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17834,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17834, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -11609,13 +7640,8 @@ void bolliger_mabillard_track_diag_flat_to_right_bank(
 }
 
 void bolliger_mabillard_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -11624,17 +7650,7 @@ void bolliger_mabillard_track_diag_left_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17834,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17834, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11647,30 +7663,10 @@ void bolliger_mabillard_track_diag_left_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17835,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17835, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17837,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17837, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -11683,17 +7679,7 @@ void bolliger_mabillard_track_diag_left_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17833,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17833, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11709,17 +7695,7 @@ void bolliger_mabillard_track_diag_left_bank_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17836,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17836, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -11738,13 +7714,8 @@ void bolliger_mabillard_track_diag_left_bank_to_flat(
 }
 
 void bolliger_mabillard_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -11753,17 +7724,7 @@ void bolliger_mabillard_track_diag_right_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17829,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17829, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11776,17 +7737,7 @@ void bolliger_mabillard_track_diag_right_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17830,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17830, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11799,30 +7750,10 @@ void bolliger_mabillard_track_diag_right_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17828,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17828, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17832,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17832, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -11838,17 +7769,7 @@ void bolliger_mabillard_track_diag_right_bank_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17831,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17831, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -11867,13 +7788,8 @@ void bolliger_mabillard_track_diag_right_bank_to_flat(
 }
 
 void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -11882,17 +7798,7 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17851,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17851, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11905,30 +7811,10 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17848,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17848, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17852,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17852, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11941,17 +7827,7 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17850,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17850, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11967,17 +7843,7 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17849,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17849, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -11996,13 +7862,8 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(
 }
 
 void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -12011,17 +7872,7 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17856,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17856, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12034,17 +7885,7 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17853,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17853, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12057,30 +7898,10 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17855,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17855, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17857,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17857, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -12096,17 +7917,7 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17854,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17854, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -12125,13 +7936,8 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(
 }
 
 void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -12140,17 +7946,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17841,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17841, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12163,30 +7959,10 @@ void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17838,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17838, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17842,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17842, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -12199,17 +7975,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17840,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17840, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12225,17 +7991,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17839,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17839, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(session, supportType, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -12254,13 +8010,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(
 }
 
 void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -12269,17 +8020,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17846,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17846, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12292,17 +8033,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17843,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17843, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12315,30 +8046,10 @@ void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17845,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17845, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17847,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17847, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -12354,17 +8065,7 @@ void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17844,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17844, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(session, supportType, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -12383,13 +8084,8 @@ void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(
 }
 
 void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -12398,17 +8094,7 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17844,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17844, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12420,30 +8106,10 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17845,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17845, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17847,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17847, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -12455,17 +8121,7 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17843,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17843, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12480,17 +8136,7 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17846,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17846, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(session, supportType, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -12510,13 +8156,8 @@ void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(
 }
 
 void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -12525,17 +8166,7 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17839,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17839, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12547,17 +8178,7 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17840,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17840, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12569,30 +8190,10 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17838,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17838, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17842,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17842, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -12607,17 +8208,7 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17841,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17841, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(session, supportType, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -12637,13 +8228,8 @@ void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(
 }
 
 void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -12652,17 +8238,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17854,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17854, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12675,30 +8251,10 @@ void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17855,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17855, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17857,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17857, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -12711,17 +8267,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17853,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17853, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12737,17 +8283,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17856,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17856, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -12766,13 +8302,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(
 }
 
 void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -12781,17 +8312,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17849,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17849, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12804,17 +8325,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17850,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17850, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12827,30 +8338,10 @@ void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17848,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17848, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17852,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17852, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -12866,17 +8357,7 @@ void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17851,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17851, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -12895,13 +8376,8 @@ void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(
 }
 
 void bolliger_mabillard_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -12910,17 +8386,7 @@ void bolliger_mabillard_track_diag_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17827,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17827, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12933,17 +8399,7 @@ void bolliger_mabillard_track_diag_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17824,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17824, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -12956,17 +8412,7 @@ void bolliger_mabillard_track_diag_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17826,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17826, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12982,17 +8428,7 @@ void bolliger_mabillard_track_diag_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17825,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17825, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -13011,13 +8447,8 @@ void bolliger_mabillard_track_diag_left_bank(
 }
 
 void bolliger_mabillard_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -13026,17 +8457,7 @@ void bolliger_mabillard_track_diag_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17825,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17825, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -13049,17 +8470,7 @@ void bolliger_mabillard_track_diag_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17826,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17826, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -13072,17 +8483,7 @@ void bolliger_mabillard_track_diag_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17824,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17824, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -13098,17 +8499,7 @@ void bolliger_mabillard_track_diag_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17827,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17827, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -13127,13 +8518,8 @@ void bolliger_mabillard_track_diag_right_bank(
 }
 
 void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -13148,17 +8534,7 @@ void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17727, 0, 6, 32, 20, 3, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17731,
-                        0,
-                        6,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17731, 0, 6, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -13223,13 +8599,8 @@ void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(
 }
 
 void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -13248,17 +8619,7 @@ void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17718, 0, 6, 32, 20, 3, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17730,
-                        0,
-                        6,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17730, 0, 6, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -13322,13 +8683,8 @@ void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(
 }
 
 void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -13381,17 +8737,7 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17718, 6, 0, 20, 32, 3, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17730,
-                        6,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17730, 6, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
@@ -13421,13 +8767,8 @@ void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(
 }
 
 void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -13481,17 +8822,7 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17727, 6, 0, 20, 32, 3, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17731,
-                        6,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17731, 6, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -13517,13 +8848,8 @@ void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(
 }
 
 void bolliger_mabillard_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -13549,13 +8875,8 @@ void bolliger_mabillard_track_block_brakes(
 }
 
 void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -13568,17 +8889,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18027,
-                        0,
-                        6,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18027, 0, 6, 32, 1, 34, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -13614,32 +8925,12 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18026,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18026, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18028,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18028, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -13665,13 +8956,8 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(
 }
 
 void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -13688,17 +8974,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18018,
-                        0,
-                        6,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18018, 0, 6, 32, 1, 34, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -13731,33 +9007,13 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18017,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18017, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18019,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18019, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -13784,13 +9040,8 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(
 }
 
 void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
     bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(
@@ -13798,13 +9049,8 @@ void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(
 }
 
 void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
     bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(
@@ -13812,13 +9058,8 @@ void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(
 }
 
 void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -13831,17 +9072,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17983,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17983, 0, 0, 32, 1, 34, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -13874,47 +9105,17 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17984,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17984, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17989,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17989, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17994,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17994, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -13922,8 +9123,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -13931,47 +9131,17 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17980,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17980, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17985,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17985, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17990,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17990, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -13991,62 +9161,22 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17981,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17981, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17986,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17986, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17991,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17991, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17996,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17996, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -14054,8 +9184,7 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -14067,32 +9196,12 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17987,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17987, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17992,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17992, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -14118,13 +9227,8 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(
 }
 
 void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -14141,17 +9245,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17968,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17968, 0, 0, 32, 1, 34, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -14176,47 +9270,17 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17959,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17959, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17964,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17964, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17969,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17969, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 3:
@@ -14228,8 +9292,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -14241,47 +9304,17 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17965,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17965, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17970,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17970, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17975,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17975, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -14297,62 +9330,22 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17961,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17961, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17966,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17966, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17971,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17971, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17976,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17976, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -14360,8 +9353,7 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -14373,32 +9365,12 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17967,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17967, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17972,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17972, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -14424,13 +9396,8 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(
 }
 
 void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
     bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(
@@ -14438,13 +9405,8 @@ void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(
 }
 
 void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
     bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(
@@ -14452,13 +9414,8 @@ void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(
 }
 
 void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -14499,13 +9456,8 @@ void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(
 }
 
 void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -14546,13 +9498,8 @@ void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(
 }
 
 void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -14593,13 +9540,8 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(
 }
 
 void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -14640,65 +9582,40 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(
 }
 
 void bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -14737,13 +9654,8 @@ void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(
 }
 
 void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -14782,13 +9694,8 @@ void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(
 }
 
 void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -14827,13 +9734,8 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(
 }
 
 void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -14872,65 +9774,40 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(
 }
 
 void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -14971,13 +9848,8 @@ void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(
 }
 
 void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -15018,13 +9890,8 @@ void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(
 }
 
 void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -15065,13 +9932,8 @@ void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(
 }
 
 void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -15112,65 +9974,40 @@ void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(
 }
 
 void bolliger_mabillard_track_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_right_banked_25_deg_up_to_flat(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_left_banked_25_deg_up_to_flat(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_left_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_flat_to_right_banked_25_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_right_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_flat_to_left_banked_25_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -15179,88 +10016,28 @@ void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17998,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17998, 0, 0, 2, 20, 63, height, 4, 6,
                         height + 8);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17999,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17999, 0, 0, 2, 20, 63, height, 4, 6,
                         height + 8);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18007,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18007, 0, 0, 2, 20, 63, height, 24, 6,
                         height + 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18008,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18008, 0, 0, 2, 20, 63, height, 24, 6,
                         height + 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18001,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18001, 0, 0, 2, 20, 63, height, 4, 6,
                         height + 8);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18009,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18009, 0, 0, 2, 20, 63, height, 24, 6,
                         height + 8);
                     break;
             }
@@ -15275,13 +10052,8 @@ void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(
 }
 
 void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -15290,88 +10062,28 @@ void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18002,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18002, 0, 0, 2, 20, 63, height, 4, 6,
                         height + 8);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18010,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18010, 0, 0, 2, 20, 63, height, 24, 6,
                         height + 8);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18011,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18011, 0, 0, 2, 20, 63, height, 24, 6,
                         height + 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18004,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18004, 0, 0, 2, 20, 63, height, 4, 6,
                         height + 8);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18012,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18012, 0, 0, 2, 20, 63, height, 24, 6,
                         height + 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18005,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18005, 0, 0, 2, 20, 63, height, 4, 6,
                         height + 8);
                     break;
             }
@@ -15386,26 +10098,16 @@ void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(
 }
 
 void bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(
         session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(
         session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement, supportType);
@@ -15413,13 +10115,8 @@ void bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(
 
 /* The following track elements used to be specific to the Vertical Roller Coaster */
 void bolliger_mabillard_track_flat_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     if (track_element_is_lift_hill(tileElement))
     {
@@ -15431,34 +10128,14 @@ void bolliger_mabillard_track_flat_to_60_deg_up(
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17465,
-                    0,
-                    0,
-                    1,
-                    24,
-                    43,
-                    height,
-                    29,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17465, 0, 0, 1, 24, 43, height, 29, 4,
                     height + 2);
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17468, 0, 0, 32, 2, 43, height, 0, 4, height);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17466,
-                    0,
-                    0,
-                    1,
-                    24,
-                    43,
-                    height,
-                    29,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17466, 0, 0, 1, 24, 43, height, 29, 4,
                     height + 2);
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17469, 0, 0, 32, 2, 43, height, 0, 4, height);
@@ -15480,34 +10157,14 @@ void bolliger_mabillard_track_flat_to_60_deg_up(
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17453,
-                    0,
-                    0,
-                    1,
-                    24,
-                    43,
-                    height,
-                    29,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17453, 0, 0, 1, 24, 43, height, 29, 4,
                     height + 2);
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17456, 0, 0, 32, 2, 43, height, 0, 4, height);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17454,
-                    0,
-                    0,
-                    1,
-                    24,
-                    43,
-                    height,
-                    29,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17454, 0, 0, 1, 24, 43, height, 29, 4,
                     height + 2);
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17457, 0, 0, 32, 2, 43, height, 0, 4, height);
@@ -15533,13 +10190,8 @@ void bolliger_mabillard_track_flat_to_60_deg_up(
 }
 
 void bolliger_mabillard_track_60_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     if (track_element_is_lift_hill(tileElement))
     {
@@ -15551,34 +10203,14 @@ void bolliger_mabillard_track_60_deg_up_to_flat(
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17471,
-                    0,
-                    0,
-                    1,
-                    24,
-                    43,
-                    height,
-                    29,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17471, 0, 0, 1, 24, 43, height, 29, 4,
                     height + 2);
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17474, 0, 0, 32, 2, 43, height, 0, 4, height);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17472,
-                    0,
-                    0,
-                    1,
-                    24,
-                    43,
-                    height,
-                    29,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17472, 0, 0, 1, 24, 43, height, 29, 4,
                     height + 2);
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17475, 0, 0, 32, 2, 43, height, 0, 4, height);
@@ -15600,34 +10232,14 @@ void bolliger_mabillard_track_60_deg_up_to_flat(
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17459,
-                    0,
-                    0,
-                    1,
-                    24,
-                    43,
-                    height,
-                    29,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17459, 0, 0, 1, 24, 43, height, 29, 4,
                     height + 2);
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17462, 0, 0, 32, 2, 43, height, 0, 4, height);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17460,
-                    0,
-                    0,
-                    1,
-                    24,
-                    43,
-                    height,
-                    29,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17460, 0, 0, 1, 24, 43, height, 29, 4,
                     height + 2);
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17463, 0, 0, 32, 2, 43, height, 0, 4, height);
@@ -15653,39 +10265,24 @@ void bolliger_mabillard_track_60_deg_up_to_flat(
 }
 
 void bolliger_mabillard_track_flat_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_60_deg_up_to_flat(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_60_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_flat_to_60_deg_up(
         session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_brake_for_drop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -15726,13 +10323,8 @@ void bolliger_mabillard_track_brake_for_drop(
 
 /* The following track elements used to be specific to the Steel Twister */
 void bolliger_mabillard_track_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -15775,33 +10367,13 @@ void bolliger_mabillard_track_half_loop_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17635,
-                        0,
-                        14,
-                        3,
-                        20,
-                        63,
-                        height,
-                        28,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17635, 0, 14, 3, 20, 63, height, 28, 6,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17632,
-                        0,
-                        6,
-                        3,
-                        20,
-                        63,
-                        height,
-                        28,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17632, 0, 6, 3, 20, 63, height, 28, 6,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -15823,17 +10395,7 @@ void bolliger_mabillard_track_half_loop_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17636,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17636, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 2:
@@ -15842,17 +10404,7 @@ void bolliger_mabillard_track_half_loop_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17639,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        15,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17639, 16, 16, 2, 16, 119, height, 15, 6,
                         height);
                     break;
             }
@@ -15860,8 +10412,7 @@ void bolliger_mabillard_track_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 168, 0x20);
             break;
         case 3:
@@ -15896,25 +10447,15 @@ void bolliger_mabillard_track_half_loop_up(
 }
 
 void bolliger_mabillard_track_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_left_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -15923,62 +10464,22 @@ void bolliger_mabillard_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17690,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17690, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17693,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17693, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17696,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17696, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17699,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17699, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
             }
@@ -15996,62 +10497,22 @@ void bolliger_mabillard_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17691,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17691, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17694,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17694, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17697,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17697, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17700,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17700, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
             }
@@ -16063,71 +10524,29 @@ void bolliger_mabillard_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17692,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17692, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17695,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17695, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17698,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17698, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17701,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17701, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(session, supportType, 4, 0, height + 35, session->TrackColours[SCHEME_SUPPORTS]);
 
             switch (direction)
@@ -16145,13 +10564,8 @@ void bolliger_mabillard_track_left_corkscrew_up(
 }
 
 void bolliger_mabillard_track_right_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -16160,62 +10574,22 @@ void bolliger_mabillard_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17702,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17702, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17705,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17705, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17708,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17708, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17711,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17711, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
             }
@@ -16225,10 +10599,8 @@ void bolliger_mabillard_track_right_corkscrew_up(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 1:
@@ -16236,62 +10608,22 @@ void bolliger_mabillard_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17703,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17703, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17706,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17706, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17709,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17709, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17712,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17712, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
             }
@@ -16303,71 +10635,29 @@ void bolliger_mabillard_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17704,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17704, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17707,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17707, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17710,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17710, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17713,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17713, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(session, supportType, 4, 0, height + 35, session->TrackColours[SCHEME_SUPPORTS]);
 
             switch (direction)
@@ -16385,39 +10675,24 @@ void bolliger_mabillard_track_right_corkscrew_up(
 }
 
 void bolliger_mabillard_track_left_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_right_corkscrew_up(
         session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_right_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_left_corkscrew_up(
         session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_flat_to_60_deg_up_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -16518,32 +10793,12 @@ void bolliger_mabillard_track_flat_to_60_deg_up_long_base(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18037,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18037, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18041,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18041, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -16573,13 +10828,8 @@ void bolliger_mabillard_track_flat_to_60_deg_up_long_base(
 
 /** rct2: 0x008AC104 */
 void bolliger_mabillard_track_60_deg_up_to_flat_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -16592,32 +10842,12 @@ void bolliger_mabillard_track_60_deg_up_to_flat_long_base(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18050,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18050, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18054,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18054, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -16734,39 +10964,24 @@ void bolliger_mabillard_track_60_deg_up_to_flat_long_base(
 }
 
 void bolliger_mabillard_track_flat_to_60_deg_down_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_flat_to_60_deg_up_long_base(
         session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_60_deg_up_to_flat_long_base122(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_60_deg_up_to_flat_long_base(
         session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_left_barrel_roll_up_to_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -16777,17 +10992,7 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17642, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17666,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17666, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     metal_a_supports_paint_setup(session, supportType, 2, 2, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -16795,17 +11000,7 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17645, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17669,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17669, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     metal_a_supports_paint_setup(session, supportType, 3, 2, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -16813,17 +11008,7 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17648, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17672,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17672, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     metal_a_supports_paint_setup(session, supportType, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -16831,17 +11016,7 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17651, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17675,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17675, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     metal_a_supports_paint_setup(session, supportType, 0, 2, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -16851,10 +11026,8 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -16864,68 +11037,28 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17643, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17667,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17667, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17646, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17670,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17670, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17649, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17673,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17673, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17652, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17676,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17676, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
             }
@@ -16933,8 +11066,7 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -16944,68 +11076,28 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17644, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17668,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17668, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17647, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17671,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17671, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17650, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17674,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17674, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17653, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17677,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17677, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
             }
@@ -17019,23 +11111,16 @@ void bolliger_mabillard_track_left_barrel_roll_up_to_down(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
     }
 }
 
 void bolliger_mabillard_track_right_barrel_roll_up_to_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -17046,17 +11131,7 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17654, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17678,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17678, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     metal_a_supports_paint_setup(session, supportType, 0, 2, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -17064,17 +11139,7 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17657, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17681,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17681, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     metal_a_supports_paint_setup(session, supportType, 2, 2, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -17082,17 +11147,7 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17660, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17684,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17684, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     metal_a_supports_paint_setup(session, supportType, 3, 2, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -17100,17 +11155,7 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17663, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17687,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17687, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     metal_a_supports_paint_setup(session, supportType, 1, 2, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -17120,10 +11165,8 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -17133,68 +11176,28 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17655, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17679,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17679, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17658, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17682,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17682, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17661, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17685,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17685, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17664, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17688,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17688, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
             }
@@ -17202,8 +11205,7 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -17213,68 +11215,28 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17656, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17680,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17680, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17659, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17683,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17683, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17662, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17686,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17686, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17665, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17689,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17689, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
             }
@@ -17288,49 +11250,32 @@ void bolliger_mabillard_track_right_barrel_roll_up_to_down(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
     }
 }
 
 void bolliger_mabillard_track_left_barrel_roll_down_to_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_left_barrel_roll_up_to_down(
         session, rideIndex, 2 - trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_right_barrel_roll_down_to_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_right_barrel_roll_up_to_down(
         session, rideIndex, 2 - trackSequence, (direction + 2) & 3, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_powered_lift(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (direction)
     {
@@ -17366,13 +11311,8 @@ void bolliger_mabillard_track_powered_lift(
 }
 
 void bolliger_mabillard_track_left_large_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -17439,47 +11379,17 @@ void bolliger_mabillard_track_left_large_half_loop_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17741,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17741, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 70);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17748,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17748, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 70);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17755,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17755, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -17487,8 +11397,7 @@ void bolliger_mabillard_track_left_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 3:
@@ -17501,49 +11410,19 @@ void bolliger_mabillard_track_left_large_half_loop_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17742,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17742, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 200);
                     metal_a_supports_paint_setup(session, supportType, 6, 22, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17749,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17749, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 200);
                     metal_a_supports_paint_setup(session, supportType, 8, 20, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17756,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17756, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 7, 20, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -17552,8 +11431,7 @@ void bolliger_mabillard_track_left_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 224, 0x20);
             break;
         case 4:
@@ -17561,62 +11439,22 @@ void bolliger_mabillard_track_left_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17736,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17736, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17743,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17743, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 110);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17750,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17750, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 100);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17757,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17757, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -17629,47 +11467,17 @@ void bolliger_mabillard_track_left_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17737,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17737, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17744,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17744, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 200);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17751,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17751, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 200);
                     break;
                 case 3:
@@ -17681,8 +11489,7 @@ void bolliger_mabillard_track_left_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 224, 0x20);
             break;
         case 6:
@@ -17690,62 +11497,22 @@ void bolliger_mabillard_track_left_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17738,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17738, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17745,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17745, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17752,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17752, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17759,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17759, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 32);
                     break;
             }
@@ -17757,21 +11524,15 @@ void bolliger_mabillard_track_left_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 40, 0x20);
             break;
     }
 }
 
 void bolliger_mabillard_track_right_large_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -17834,47 +11595,17 @@ void bolliger_mabillard_track_right_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17783,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17783, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17776,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17776, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 70);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17769,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17769, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 70);
                     break;
                 case 3:
@@ -17886,8 +11617,7 @@ void bolliger_mabillard_track_right_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 3:
@@ -17895,49 +11625,19 @@ void bolliger_mabillard_track_right_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17784,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17784, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(session, supportType, 8, 20, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17777,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17777, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 200);
                     metal_a_supports_paint_setup(session, supportType, 7, 20, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17770,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17770, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 200);
                     metal_a_supports_paint_setup(session, supportType, 5, 22, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
@@ -17951,8 +11651,7 @@ void bolliger_mabillard_track_right_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 224, 0x20);
             break;
         case 4:
@@ -17960,62 +11659,22 @@ void bolliger_mabillard_track_right_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17785,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17785, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17778,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17778, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 100);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17771,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17771, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 110);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17764,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17764, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -18032,47 +11691,17 @@ void bolliger_mabillard_track_right_large_half_loop_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17779,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17779, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 200);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17772,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17772, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 200);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17765,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17765, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -18080,8 +11709,7 @@ void bolliger_mabillard_track_right_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 224, 0x20);
             break;
         case 6:
@@ -18089,62 +11717,22 @@ void bolliger_mabillard_track_right_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17787,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17787, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17780,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17780, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17773,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17773, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17766,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17766, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 32);
                     break;
             }
@@ -18156,47 +11744,31 @@ void bolliger_mabillard_track_right_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 40, 0x20);
             break;
     }
 }
 
 void bolliger_mabillard_track_right_large_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_right_large_half_loop_up(
         session, rideIndex, 6 - trackSequence, direction, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_left_large_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_left_large_half_loop_up(
         session, rideIndex, 6 - trackSequence, direction, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     switch (trackSequence)
     {
@@ -18205,62 +11777,22 @@ void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18062,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18062, 0, 0, 2, 20, 31, height, 4, 6,
                         height + 8);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18065,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18065, 0, 0, 2, 20, 31, height, 24, 6,
                         height + 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18068,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18068, 0, 0, 2, 20, 31, height, 24, 6,
                         height + 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18071,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18071, 0, 0, 2, 20, 31, height, 4, 6,
                         height + 8);
                     break;
             }
@@ -18273,62 +11805,22 @@ void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18063,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        -8,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18063, 0, 0, 2, 20, 31, height, -8, 6,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18066,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18066, 0, 0, 2, 20, 63, height, 24, 6,
                         height + 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18069,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18069, 0, 0, 2, 20, 63, height, 24, 6,
                         height + 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18072,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        -8,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18072, 0, 0, 2, 20, 31, height, -8, 6,
                         height);
                     break;
             }
@@ -18341,62 +11833,22 @@ void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18064,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18064, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18067,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18067, 0, 0, 2, 20, 31, height, 24, 6,
                         height + 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18070,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18070, 0, 0, 2, 20, 31, height, 24, 6,
                         height + 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18073,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18073, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 24);
                     break;
             }
@@ -18412,26 +11864,16 @@ void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(
 }
 
 void bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(
         session, rideIndex, 2 - trackSequence, direction, height, tileElement, supportType);
 }
 
 void bolliger_mabillard_track_booster(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType)
 {
     // These offsets could be moved to the g2.dat file when that supports offsets.
     int8_t ne_sw_offsetX = 8;
@@ -18444,34 +11886,14 @@ void bolliger_mabillard_track_booster(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | SPR_G2_BM_BOOSTER_NE_SW,
-                ne_sw_offsetX,
-                ne_sw_offsetY,
-                32,
-                20,
-                3,
-                height,
-                0,
-                6,
-                height);
+                session, direction, session->TrackColours[SCHEME_TRACK] | SPR_G2_BM_BOOSTER_NE_SW, ne_sw_offsetX, ne_sw_offsetY,
+                32, 20, 3, height, 0, 6, height);
             break;
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | SPR_G2_BM_BOOSTER_NW_SE,
-                nw_se_offsetX,
-                nw_se_offsetY,
-                32,
-                20,
-                3,
-                height,
-                0,
-                6,
-                height);
+                session, direction, session->TrackColours[SCHEME_TRACK] | SPR_G2_BM_BOOSTER_NW_SE, nw_se_offsetX, nw_se_offsetY,
+                32, 20, 3, height, 0, 6, height);
             break;
     }
     if (track_paint_util_should_paint_supports(session->MapPosition))
diff --git a/src/openrct2/ride/coaster/BolligerMabillardTrack.h b/src/openrct2/ride/coaster/BolligerMabillardTrack.h
index f8ce121a87..fbdfeb1555 100644
--- a/src/openrct2/ride/coaster/BolligerMabillardTrack.h
+++ b/src/openrct2/ride/coaster/BolligerMabillardTrack.h
@@ -15,1439 +15,544 @@ struct paint_session;
 struct rct_tile_element;
 
 void bolliger_mabillard_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_up_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_up_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_down_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_down_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_60_deg_up_to_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_90_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_90_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_60_deg_down_to_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 
 /* Previously specific to the Vertical RC */
 void bolliger_mabillard_track_flat_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_60_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_flat_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_60_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_brake_for_drop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_flat_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_60_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_flat_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_diag_60_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 
 /* Previously specific to the Steel Twister */
 void bolliger_mabillard_track_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_flat_to_60_deg_up_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_60_deg_up_to_flat_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_flat_to_60_deg_down_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_60_deg_up_to_flat_long_base122(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_barrel_roll_up_to_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_barrel_roll_up_to_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_barrel_roll_down_to_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_barrel_roll_down_to_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_powered_lift(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_large_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_large_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_right_large_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_left_large_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 void bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
 
 void bolliger_mabillard_track_booster(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
-    const rct_tile_element* tileElement,
-    int32_t supportType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
+    const rct_tile_element* tileElement, int32_t supportType);
diff --git a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp
index cae6b0fd85..8088a3e304 100644
--- a/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp
+++ b/src/openrct2/ride/coaster/CompactInvertedCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x008AE6E0 */
 static void compact_inverted_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -35,33 +31,13 @@ static void compact_inverted_rc_track_flat(
             case 0:
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26557,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26557, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 29);
                 break;
             case 1:
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26558,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26558, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 29);
                 break;
         }
@@ -73,33 +49,13 @@ static void compact_inverted_rc_track_flat(
             case 0:
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26555,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26555, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 29);
                 break;
             case 1:
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26556,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26556, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 29);
                 break;
         }
@@ -119,11 +75,7 @@ static void compact_inverted_rc_track_flat(
 
 /** rct2: 0x008AE950, 0x008AE960, 0x008AE970 */
 static void compact_inverted_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -136,30 +88,10 @@ static void compact_inverted_rc_track_station(
     sub_98197C_rotated(
         session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height, 0, 2, height);
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-        0,
-        0,
-        32,
-        20,
-        3,
-        height + 29,
-        0,
-        6,
+        session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 3, height + 29, 0, 6,
         height + 29);
     sub_98199C_rotated(
-        session,
-        direction,
-        imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS],
-        0,
-        6,
-        32,
-        20,
-        3,
-        height + 29,
-        0,
-        6,
+        session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 29, 0, 6,
         height + 29);
     track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 11);
     track_paint_util_draw_station_inverted(session, rideIndex, direction, height, tileElement, STATION_VARIANT_TALL);
@@ -170,11 +102,7 @@ static void compact_inverted_rc_track_station(
 
 /** rct2: 0x008AE6F0 */
 static void compact_inverted_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -183,62 +111,22 @@ static void compact_inverted_rc_track_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26621,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26621, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26622,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26622, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26623,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26623, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26624,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26624, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
         }
@@ -249,62 +137,22 @@ static void compact_inverted_rc_track_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26569,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26569, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26570,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26570, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26571,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26571, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26572,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26572, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
         }
@@ -348,11 +196,7 @@ static void compact_inverted_rc_track_25_deg_up(
 
 /** rct2: 0x008AE700 */
 static void compact_inverted_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -361,62 +205,22 @@ static void compact_inverted_rc_track_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26637,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26637, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 93);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26638,
-                    0,
-                    0,
-                    32,
-                    2,
-                    81,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26638, 0, 0, 32, 2, 81, height + 29, 0, 4,
                     height + 11);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26639,
-                    0,
-                    0,
-                    32,
-                    2,
-                    81,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26639, 0, 0, 32, 2, 81, height + 29, 0, 4,
                     height + 11);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26640,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26640, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 93);
                 break;
         }
@@ -427,62 +231,22 @@ static void compact_inverted_rc_track_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26585,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26585, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 93);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26586,
-                    0,
-                    0,
-                    32,
-                    2,
-                    81,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26586, 0, 0, 32, 2, 81, height + 29, 0, 4,
                     height + 11);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26587,
-                    0,
-                    0,
-                    32,
-                    2,
-                    81,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26587, 0, 0, 32, 2, 81, height + 29, 0, 4,
                     height + 11);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26588,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26588, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 93);
                 break;
         }
@@ -502,11 +266,7 @@ static void compact_inverted_rc_track_60_deg_up(
 
 /** rct2: 0x008AE710 */
 static void compact_inverted_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -515,62 +275,22 @@ static void compact_inverted_rc_track_flat_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26613,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26613, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26614,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26614, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26615,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26615, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26616,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26616, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
         }
@@ -581,62 +301,22 @@ static void compact_inverted_rc_track_flat_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26561,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26561, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26562,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26562, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26563,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26563, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26564,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26564, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
         }
@@ -680,11 +360,7 @@ static void compact_inverted_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x008AE720 */
 static void compact_inverted_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -693,88 +369,28 @@ static void compact_inverted_rc_track_25_deg_up_to_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26625,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26625, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 61);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26629,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 29,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26629, 0, 0, 32, 10, 49, height + 29, 0, 10,
                     height + 11);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26626,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26626, 0, 0, 32, 2, 49, height + 29, 0, 4,
                     height + 11);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26630,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 29,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26630, 0, 0, 32, 10, 49, height + 29, 0, 10,
                     height + 11);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26627,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26627, 0, 0, 32, 2, 49, height + 29, 0, 4,
                     height + 11);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26628,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26628, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 61);
                 break;
         }
@@ -785,88 +401,28 @@ static void compact_inverted_rc_track_25_deg_up_to_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26573,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26573, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 61);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26577,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 29,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26577, 0, 0, 32, 10, 49, height + 29, 0, 10,
                     height + 11);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26574,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26574, 0, 0, 32, 2, 49, height + 29, 0, 4,
                     height + 11);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26578,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 29,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26578, 0, 0, 32, 10, 49, height + 29, 0, 10,
                     height + 11);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26575,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26575, 0, 0, 32, 2, 49, height + 29, 0, 4,
                     height + 11);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26576,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26576, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 61);
                 break;
         }
@@ -886,11 +442,7 @@ static void compact_inverted_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008AE730 */
 static void compact_inverted_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -899,88 +451,28 @@ static void compact_inverted_rc_track_60_deg_up_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26631,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26631, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 61);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26635,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 29,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26635, 0, 0, 32, 10, 49, height + 29, 0, 10,
                     height + 11);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26632,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26632, 0, 0, 32, 2, 49, height + 29, 0, 4,
                     height + 11);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26636,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 29,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26636, 0, 0, 32, 10, 49, height + 29, 0, 10,
                     height + 11);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26633,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26633, 0, 0, 32, 2, 49, height + 29, 0, 4,
                     height + 11);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26634,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26634, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 61);
                 break;
         }
@@ -991,88 +483,28 @@ static void compact_inverted_rc_track_60_deg_up_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26579,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26579, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 61);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26583,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 29,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26583, 0, 0, 32, 10, 49, height + 29, 0, 10,
                     height + 11);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26580,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26580, 0, 0, 32, 2, 49, height + 29, 0, 4,
                     height + 11);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26584,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 29,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26584, 0, 0, 32, 10, 49, height + 29, 0, 10,
                     height + 11);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26581,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26581, 0, 0, 32, 2, 49, height + 29, 0, 4,
                     height + 11);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26582,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26582, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 61);
                 break;
         }
@@ -1116,11 +548,7 @@ static void compact_inverted_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008AE740 */
 static void compact_inverted_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -1129,62 +557,22 @@ static void compact_inverted_rc_track_25_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26617,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26617, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26618,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26618, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26619,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26619, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26620,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26620, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
         }
@@ -1195,62 +583,22 @@ static void compact_inverted_rc_track_25_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26565,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26565, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26566,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26566, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26567,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26567, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26568,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26568, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
         }
@@ -1294,11 +642,7 @@ static void compact_inverted_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x008AE750 */
 static void compact_inverted_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1306,11 +650,7 @@ static void compact_inverted_rc_track_25_deg_down(
 
 /** rct2: 0x008AE760 */
 static void compact_inverted_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1318,11 +658,7 @@ static void compact_inverted_rc_track_60_deg_down(
 
 /** rct2: 0x008AE770 */
 static void compact_inverted_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1330,11 +666,7 @@ static void compact_inverted_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008AE780 */
 static void compact_inverted_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_60_deg_up_to_25_deg_up(
@@ -1343,11 +675,7 @@ static void compact_inverted_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008AE790 */
 static void compact_inverted_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_25_deg_up_to_60_deg_up(
@@ -1356,11 +684,7 @@ static void compact_inverted_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008AE7A0 */
 static void compact_inverted_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1368,11 +692,7 @@ static void compact_inverted_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x008AE7B0 */
 static void compact_inverted_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1382,71 +702,29 @@ static void compact_inverted_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26694,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26694, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26699,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26699, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26704,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26704, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26689,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26689, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1472,32 +750,12 @@ static void compact_inverted_rc_track_left_quarter_turn_5(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26703,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26703, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26688,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26688, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
@@ -1505,8 +763,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -1514,47 +771,17 @@ static void compact_inverted_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26692,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26692, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26697,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26697, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26702,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26702, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 3:
@@ -1574,17 +801,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26691,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26691, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
@@ -1597,17 +814,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26686,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26686, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 29);
                     break;
             }
@@ -1615,8 +822,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -1624,71 +830,29 @@ static void compact_inverted_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26690,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26690, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26695,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26695, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26700,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26700, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26685,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26685, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1708,11 +872,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x008AE7C0 */
 static void compact_inverted_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1721,73 +881,29 @@ static void compact_inverted_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x008AE7D0 */
 static void compact_inverted_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26657,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26657, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26658,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26658, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26659,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26659, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26660,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26660, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -1795,8 +911,7 @@ static void compact_inverted_rc_track_flat_to_left_bank(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         metal_a_supports_paint_setup(
@@ -1809,73 +924,29 @@ static void compact_inverted_rc_track_flat_to_left_bank(
 
 /** rct2: 0x008AE7E0 */
 static void compact_inverted_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26661,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26661, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26662,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26662, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26663,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26663, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26664,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26664, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -1883,8 +954,7 @@ static void compact_inverted_rc_track_flat_to_right_bank(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         metal_a_supports_paint_setup(
@@ -1897,73 +967,29 @@ static void compact_inverted_rc_track_flat_to_right_bank(
 
 /** rct2: 0x008AE7F0 */
 static void compact_inverted_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26663,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26663, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26664,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26664, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26661,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26661, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26662,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26662, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -1971,8 +997,7 @@ static void compact_inverted_rc_track_left_bank_to_flat(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         metal_a_supports_paint_setup(
@@ -1985,73 +1010,29 @@ static void compact_inverted_rc_track_left_bank_to_flat(
 
 /** rct2: 0x008AE800 */
 static void compact_inverted_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26659,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26659, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26660,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26660, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26657,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26657, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26658,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26658, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -2059,8 +1040,7 @@ static void compact_inverted_rc_track_right_bank_to_flat(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         metal_a_supports_paint_setup(
@@ -2073,11 +1053,7 @@ static void compact_inverted_rc_track_right_bank_to_flat(
 
 /** rct2: 0x008AE810 */
 static void compact_inverted_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2087,71 +1063,29 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26738,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26738, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26743,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26743, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26748,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26748, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26733,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26733, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2177,32 +1111,12 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26747,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26747, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26732,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26732, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
@@ -2210,8 +1124,7 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -2219,47 +1132,17 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26736,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26736, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26741,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26741, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26746,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26746, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 3:
@@ -2279,17 +1162,7 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26735,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26735, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
@@ -2302,17 +1175,7 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26730,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26730, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 29);
                     break;
             }
@@ -2320,8 +1183,7 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -2329,71 +1191,29 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26734,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26734, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26739,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26739, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26744,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26744, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26729,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26729, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2413,11 +1233,7 @@ static void compact_inverted_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x008AE820 */
 static void compact_inverted_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2427,73 +1243,29 @@ static void compact_inverted_rc_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x008AE830 */
 static void compact_inverted_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26665,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26665, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26666,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26666, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26667,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26667, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26668,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26668, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -2501,8 +1273,7 @@ static void compact_inverted_rc_track_left_bank_to_25_deg_up(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         switch (direction)
@@ -2539,73 +1310,29 @@ static void compact_inverted_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x008AE840 */
 static void compact_inverted_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26669,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26669, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26670,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26670, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26671,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26671, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26672,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26672, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -2613,8 +1340,7 @@ static void compact_inverted_rc_track_right_bank_to_25_deg_up(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         switch (direction)
@@ -2651,73 +1377,29 @@ static void compact_inverted_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x008AE850 */
 static void compact_inverted_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26673,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26673, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26674,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26674, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26675,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26675, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26676,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26676, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -2725,8 +1407,7 @@ static void compact_inverted_rc_track_25_deg_up_to_left_bank(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         switch (direction)
@@ -2763,73 +1444,29 @@ static void compact_inverted_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x008AE860 */
 static void compact_inverted_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26677,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26677, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26678,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26678, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26679,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26679, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26680,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26680, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -2837,8 +1474,7 @@ static void compact_inverted_rc_track_25_deg_up_to_right_bank(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         switch (direction)
@@ -2875,11 +1511,7 @@ static void compact_inverted_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x008AE870 */
 static void compact_inverted_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_25_deg_up_to_right_bank(
@@ -2888,11 +1520,7 @@ static void compact_inverted_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x008AE880 */
 static void compact_inverted_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_25_deg_up_to_left_bank(
@@ -2901,11 +1529,7 @@ static void compact_inverted_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x008AE890 */
 static void compact_inverted_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_right_bank_to_25_deg_up(
@@ -2914,11 +1538,7 @@ static void compact_inverted_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x008AE8A0 */
 static void compact_inverted_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_left_bank_to_25_deg_up(
@@ -2927,73 +1547,29 @@ static void compact_inverted_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x008AE8B0 */
 static void compact_inverted_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26681,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26681, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26682,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26682, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26683,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26683, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26684,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26684, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -3001,8 +1577,7 @@ static void compact_inverted_rc_track_left_bank(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         metal_a_supports_paint_setup(
@@ -3015,11 +1590,7 @@ static void compact_inverted_rc_track_left_bank(
 
 /** rct2: 0x008AE8C0 */
 static void compact_inverted_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -3027,11 +1598,7 @@ static void compact_inverted_rc_track_right_bank(
 
 /** rct2: 0x008AE8D0 */
 static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3058,10 +1625,8 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 48, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3098,8 +1663,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 3:
@@ -3153,8 +1717,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 6:
@@ -3179,10 +1742,8 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 48, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3202,11 +1763,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008AE8E0 */
 static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3233,10 +1790,8 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 48, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3273,8 +1828,7 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 3:
@@ -3328,8 +1882,7 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 6:
@@ -3354,10 +1907,8 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 48, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3377,11 +1928,7 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008AE8F0 */
 static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -3391,11 +1938,7 @@ static void compact_inverted_rc_track_left_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008AE900 */
 static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -3405,11 +1948,7 @@ static void compact_inverted_rc_track_right_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008AE910 */
 static void compact_inverted_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3419,62 +1958,22 @@ static void compact_inverted_rc_track_s_bend_left(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26641,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26641, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26645,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26645, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26644,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26644, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26648,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26648, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -3503,32 +2002,12 @@ static void compact_inverted_rc_track_s_bend_left(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26643,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26643, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26647,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26647, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -3537,8 +2016,7 @@ static void compact_inverted_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -3558,32 +2036,12 @@ static void compact_inverted_rc_track_s_bend_left(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26643,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26643, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26647,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26647, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
@@ -3600,8 +2058,7 @@ static void compact_inverted_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 2:
@@ -3621,62 +2078,22 @@ static void compact_inverted_rc_track_s_bend_left(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26644,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26644, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26648,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26648, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26641,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26641, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26645,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26645, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -3702,11 +2119,7 @@ static void compact_inverted_rc_track_s_bend_left(
 
 /** rct2: 0x008AE920 */
 static void compact_inverted_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3716,62 +2129,22 @@ static void compact_inverted_rc_track_s_bend_right(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26649,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26649, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26653,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26653, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26652,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26652, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26656,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26656, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -3792,32 +2165,12 @@ static void compact_inverted_rc_track_s_bend_right(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26650,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26650, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26654,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26654, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
@@ -3834,8 +2187,7 @@ static void compact_inverted_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -3863,32 +2215,12 @@ static void compact_inverted_rc_track_s_bend_right(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26650,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26650, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26654,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26654, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -3897,8 +2229,7 @@ static void compact_inverted_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 2:
@@ -3918,62 +2249,22 @@ static void compact_inverted_rc_track_s_bend_right(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26652,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26652, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26656,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26656, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26649,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26649, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26653,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26653, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -3999,11 +2290,7 @@ static void compact_inverted_rc_track_s_bend_right(
 
 /** rct2: 0x008AE930 */
 static void compact_inverted_rc_track_left_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4013,62 +2300,22 @@ static void compact_inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27017,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27017, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27025,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27025, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27024,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27024, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27032,
-                        0,
-                        6,
-                        32,
-                        10,
-                        7,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27032, 0, 6, 32, 10, 7, height + 29, 0, 6,
                         height + 45);
                     break;
             }
@@ -4078,8 +2325,7 @@ static void compact_inverted_rc_track_left_vertical_loop(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -4111,62 +2357,22 @@ static void compact_inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27018,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27018, 0, 0, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27026,
-                        0,
-                        14,
-                        32,
-                        2,
-                        63,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27026, 0, 14, 32, 2, 63, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27023,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27023, 0, 6, 32, 2, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27031,
-                        0,
-                        6,
-                        2,
-                        2,
-                        3,
-                        height + 29,
-                        29,
-                        20,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27031, 0, 6, 2, 2, 3, height + 29, 29, 20,
                         height + 29);
                     break;
             }
@@ -4178,62 +2384,22 @@ static void compact_inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27019,
-                        16,
-                        0,
-                        5,
-                        2,
-                        119,
-                        height + 2,
-                        16,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27019, 16, 0, 5, 2, 119, height + 2, 16, 29,
                         height + 2);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27027,
-                        12,
-                        0,
-                        32,
-                        2,
-                        119,
-                        height + 2,
-                        0,
-                        -6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27027, 12, 0, 32, 2, 119, height + 2, 0, -6,
                         height + 2);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27022,
-                        10,
-                        16,
-                        4,
-                        2,
-                        119,
-                        height + 2,
-                        10,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27022, 10, 16, 4, 2, 119, height + 2, 10, 0,
                         height + 2);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27030,
-                        16,
-                        16,
-                        2,
-                        2,
-                        119,
-                        height + 2,
-                        29,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27030, 16, 16, 2, 2, 119, height + 2, 29, 29,
                         height + 2);
                     break;
             }
@@ -4246,62 +2412,22 @@ static void compact_inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27020,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27020, 0, 0, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27028,
-                        0,
-                        0,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27028, 0, 0, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27021,
-                        0,
-                        16,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27021, 0, 16, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27029,
-                        0,
-                        16,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27029, 0, 16, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
             }
@@ -4309,8 +2435,7 @@ static void compact_inverted_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 4:
@@ -4324,62 +2449,22 @@ static void compact_inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27021,
-                        0,
-                        16,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27021, 0, 16, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27029,
-                        0,
-                        16,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27029, 0, 16, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27020,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27020, 0, 0, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27028,
-                        0,
-                        0,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27028, 0, 0, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
             }
@@ -4387,8 +2472,7 @@ static void compact_inverted_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 7:
@@ -4396,62 +2480,22 @@ static void compact_inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27022,
-                        10,
-                        16,
-                        4,
-                        2,
-                        119,
-                        height + 2,
-                        10,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27022, 10, 16, 4, 2, 119, height + 2, 10, 0,
                         height + 2);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27030,
-                        16,
-                        16,
-                        2,
-                        2,
-                        119,
-                        height + 2,
-                        29,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27030, 16, 16, 2, 2, 119, height + 2, 29, 29,
                         height + 2);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27019,
-                        16,
-                        0,
-                        5,
-                        2,
-                        119,
-                        height + 2,
-                        16,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27019, 16, 0, 5, 2, 119, height + 2, 16, 29,
                         height + 2);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27027,
-                        12,
-                        0,
-                        32,
-                        2,
-                        119,
-                        height + 2,
-                        0,
-                        -6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27027, 12, 0, 32, 2, 119, height + 2, 0, -6,
                         height + 2);
                     break;
             }
@@ -4464,62 +2508,22 @@ static void compact_inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27023,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27023, 0, 6, 32, 2, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27031,
-                        0,
-                        6,
-                        2,
-                        2,
-                        3,
-                        height + 29,
-                        29,
-                        20,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27031, 0, 6, 2, 2, 3, height + 29, 29, 20,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27018,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27018, 0, 0, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27026,
-                        0,
-                        14,
-                        32,
-                        2,
-                        63,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27026, 0, 14, 32, 2, 63, height + 29, 0, 29,
                         height + 29);
                     break;
             }
@@ -4531,62 +2535,22 @@ static void compact_inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27024,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27024, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27032,
-                        0,
-                        6,
-                        32,
-                        10,
-                        7,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27032, 0, 6, 32, 10, 7, height + 29, 0, 6,
                         height + 45);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27017,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27017, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27025,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27025, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
             }
@@ -4596,8 +2560,7 @@ static void compact_inverted_rc_track_left_vertical_loop(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -4634,11 +2597,7 @@ static void compact_inverted_rc_track_left_vertical_loop(
 
 /** rct2: 0x008AE940 */
 static void compact_inverted_rc_track_right_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4648,62 +2607,22 @@ static void compact_inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27048,
-                        0,
-                        6,
-                        32,
-                        10,
-                        7,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27048, 0, 6, 32, 10, 7, height + 29, 0, 6,
                         height + 45);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27040,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27040, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27041,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27041, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27033,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27033, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
             }
@@ -4713,8 +2632,7 @@ static void compact_inverted_rc_track_right_vertical_loop(
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -4746,62 +2664,22 @@ static void compact_inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27047,
-                        0,
-                        6,
-                        2,
-                        2,
-                        3,
-                        height + 29,
-                        29,
-                        20,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27047, 0, 6, 2, 2, 3, height + 29, 29, 20,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27039,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27039, 0, 6, 32, 2, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27042,
-                        0,
-                        14,
-                        32,
-                        2,
-                        63,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27042, 0, 14, 32, 2, 63, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27034,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27034, 0, 0, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
             }
@@ -4813,62 +2691,22 @@ static void compact_inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27046,
-                        16,
-                        16,
-                        2,
-                        2,
-                        119,
-                        height + 2,
-                        29,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27046, 16, 16, 2, 2, 119, height + 2, 29, 29,
                         height + 2);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27038,
-                        10,
-                        16,
-                        4,
-                        2,
-                        119,
-                        height + 2,
-                        10,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27038, 10, 16, 4, 2, 119, height + 2, 10, 0,
                         height + 2);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27043,
-                        12,
-                        0,
-                        32,
-                        2,
-                        119,
-                        height + 2,
-                        0,
-                        -6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27043, 12, 0, 32, 2, 119, height + 2, 0, -6,
                         height + 2);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27035,
-                        16,
-                        0,
-                        5,
-                        2,
-                        119,
-                        height + 2,
-                        16,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27035, 16, 0, 5, 2, 119, height + 2, 16, 29,
                         height + 2);
                     break;
             }
@@ -4881,62 +2719,22 @@ static void compact_inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27045,
-                        0,
-                        16,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27045, 0, 16, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27037,
-                        0,
-                        16,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27037, 0, 16, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27044,
-                        0,
-                        0,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27044, 0, 0, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27036,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27036, 0, 0, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
             }
@@ -4944,8 +2742,7 @@ static void compact_inverted_rc_track_right_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 4:
@@ -4959,62 +2756,22 @@ static void compact_inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27044,
-                        0,
-                        0,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27044, 0, 0, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27036,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27036, 0, 0, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27045,
-                        0,
-                        16,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27045, 0, 16, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27037,
-                        0,
-                        16,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27037, 0, 16, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
             }
@@ -5022,8 +2779,7 @@ static void compact_inverted_rc_track_right_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 7:
@@ -5031,62 +2787,22 @@ static void compact_inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27043,
-                        12,
-                        0,
-                        32,
-                        2,
-                        119,
-                        height + 2,
-                        0,
-                        -6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27043, 12, 0, 32, 2, 119, height + 2, 0, -6,
                         height + 2);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27035,
-                        16,
-                        0,
-                        5,
-                        2,
-                        119,
-                        height + 2,
-                        16,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27035, 16, 0, 5, 2, 119, height + 2, 16, 29,
                         height + 2);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27046,
-                        16,
-                        16,
-                        2,
-                        2,
-                        119,
-                        height + 2,
-                        29,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27046, 16, 16, 2, 2, 119, height + 2, 29, 29,
                         height + 2);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27038,
-                        10,
-                        16,
-                        4,
-                        2,
-                        119,
-                        height + 2,
-                        10,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27038, 10, 16, 4, 2, 119, height + 2, 10, 0,
                         height + 2);
                     break;
             }
@@ -5099,62 +2815,22 @@ static void compact_inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27042,
-                        0,
-                        14,
-                        32,
-                        2,
-                        63,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27042, 0, 14, 32, 2, 63, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27034,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27034, 0, 0, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27047,
-                        0,
-                        6,
-                        2,
-                        2,
-                        3,
-                        height + 29,
-                        29,
-                        20,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27047, 0, 6, 2, 2, 3, height + 29, 29, 20,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27039,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27039, 0, 6, 32, 2, 3, height + 29, 0, 0,
                         height + 29);
                     break;
             }
@@ -5166,62 +2842,22 @@ static void compact_inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27041,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27041, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27033,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27033, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27048,
-                        0,
-                        6,
-                        32,
-                        10,
-                        7,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27048, 0, 6, 32, 10, 7, height + 29, 0, 6,
                         height + 45);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27040,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27040, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
             }
@@ -5231,8 +2867,7 @@ static void compact_inverted_rc_track_right_vertical_loop(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -5269,11 +2904,7 @@ static void compact_inverted_rc_track_right_vertical_loop(
 
 /** rct2: 0x008AE980 */
 static void compact_inverted_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5283,71 +2914,29 @@ static void compact_inverted_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26710,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26710, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26713,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26713, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26716,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26716, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26707,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26707, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5365,17 +2954,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26709,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26709, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
@@ -5384,32 +2963,12 @@ static void compact_inverted_rc_track_left_quarter_turn_3(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26715,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26715, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26706,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26706, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
             }
@@ -5422,71 +2981,29 @@ static void compact_inverted_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26708,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26708, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26711,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26711, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26714,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26714, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26705,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26705, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5506,11 +3023,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x008AE990 */
 static void compact_inverted_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -5519,11 +3032,7 @@ static void compact_inverted_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x008AE9A0 */
 static void compact_inverted_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5533,71 +3042,29 @@ static void compact_inverted_rc_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26722,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26722, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26725,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26725, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26728,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26728, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26719,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26719, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5615,62 +3082,22 @@ static void compact_inverted_rc_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26721,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26721, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26724,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26724, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26727,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26727, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26718,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26718, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
             }
@@ -5683,71 +3110,29 @@ static void compact_inverted_rc_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26720,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26720, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26723,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26723, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26726,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26726, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26717,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26717, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5767,11 +3152,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x008AE9B0 */
 static void compact_inverted_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -5781,11 +3162,7 @@ static void compact_inverted_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x008AE9C0 */
 static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5812,10 +3189,8 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 46, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5853,10 +3228,8 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 46, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5876,11 +3249,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008AE9D0 */
 static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5907,10 +3276,8 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 46, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5948,10 +3315,8 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 46, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5971,11 +3336,7 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008AE9E0 */
 static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -5985,11 +3346,7 @@ static void compact_inverted_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008AE9F0 */
 static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -5999,11 +3356,7 @@ static void compact_inverted_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008AEA00 */
 static void compact_inverted_rc_track_left_twist_down_to_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6033,8 +3386,7 @@ static void compact_inverted_rc_track_left_twist_down_to_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -6068,8 +3420,7 @@ static void compact_inverted_rc_track_left_twist_down_to_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -6107,8 +3458,7 @@ static void compact_inverted_rc_track_left_twist_down_to_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
     }
@@ -6116,11 +3466,7 @@ static void compact_inverted_rc_track_left_twist_down_to_up(
 
 /** rct2: 0x008AEA10 */
 static void compact_inverted_rc_track_right_twist_down_to_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6150,8 +3496,7 @@ static void compact_inverted_rc_track_right_twist_down_to_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -6185,8 +3530,7 @@ static void compact_inverted_rc_track_right_twist_down_to_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -6224,8 +3568,7 @@ static void compact_inverted_rc_track_right_twist_down_to_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
     }
@@ -6233,11 +3576,7 @@ static void compact_inverted_rc_track_right_twist_down_to_up(
 
 /** rct2: 0x008AEA20 */
 static void compact_inverted_rc_track_left_twist_up_to_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6272,8 +3611,7 @@ static void compact_inverted_rc_track_left_twist_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 1:
@@ -6300,8 +3638,7 @@ static void compact_inverted_rc_track_left_twist_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -6329,8 +3666,7 @@ static void compact_inverted_rc_track_left_twist_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -6350,11 +3686,7 @@ static void compact_inverted_rc_track_left_twist_up_to_down(
 
 /** rct2: 0x008AEA30 */
 static void compact_inverted_rc_track_right_twist_up_to_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6389,8 +3721,7 @@ static void compact_inverted_rc_track_right_twist_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 1:
@@ -6417,8 +3748,7 @@ static void compact_inverted_rc_track_right_twist_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -6446,8 +3776,7 @@ static void compact_inverted_rc_track_right_twist_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -6467,11 +3796,7 @@ static void compact_inverted_rc_track_right_twist_up_to_down(
 
 /** rct2: 0x008AEA40 */
 static void compact_inverted_rc_track_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6481,62 +3806,22 @@ static void compact_inverted_rc_track_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27073,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27073, 0, 6, 32, 20, 3, height + 29, 0, 6,
                         height + 45);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27081,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27081, 0, 6, 32, 20, 3, height + 29, 0, 6,
                         height + 45);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27080,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27080, 0, 6, 32, 20, 3, height + 29, 0, 6,
                         height + 45);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27088,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27088, 0, 6, 32, 20, 3, height + 29, 0, 6,
                         height + 45);
                     break;
             }
@@ -6574,62 +3859,22 @@ static void compact_inverted_rc_track_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27074,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27074, 0, 0, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27082,
-                        0,
-                        14,
-                        32,
-                        2,
-                        63,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27082, 0, 14, 32, 2, 63, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27079,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27079, 0, 6, 32, 2, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27087,
-                        0,
-                        6,
-                        2,
-                        2,
-                        3,
-                        height + 29,
-                        29,
-                        20,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27087, 0, 6, 2, 2, 3, height + 29, 29, 20,
                         height + 29);
                     break;
             }
@@ -6641,62 +3886,22 @@ static void compact_inverted_rc_track_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27075,
-                        16,
-                        0,
-                        5,
-                        2,
-                        119,
-                        height + 2,
-                        16,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27075, 16, 0, 5, 2, 119, height + 2, 16, 29,
                         height + 2);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27083,
-                        12,
-                        0,
-                        32,
-                        2,
-                        119,
-                        height + 2,
-                        0,
-                        -6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27083, 12, 0, 32, 2, 119, height + 2, 0, -6,
                         height + 2);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27078,
-                        10,
-                        16,
-                        4,
-                        2,
-                        119,
-                        height + 2,
-                        10,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27078, 10, 16, 4, 2, 119, height + 2, 10, 0,
                         height + 2);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27086,
-                        16,
-                        16,
-                        2,
-                        2,
-                        119,
-                        height + 2,
-                        29,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27086, 16, 16, 2, 2, 119, height + 2, 29, 29,
                         height + 2);
                     break;
             }
@@ -6704,8 +3909,7 @@ static void compact_inverted_rc_track_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 168, 0x20);
             break;
         case 3:
@@ -6713,62 +3917,22 @@ static void compact_inverted_rc_track_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27076,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 34,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27076, 0, 0, 32, 20, 3, height + 34, 0, 6,
                         height + 34);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27084,
-                        0,
-                        0,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27084, 0, 0, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27077,
-                        0,
-                        16,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27077, 0, 16, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27085,
-                        0,
-                        16,
-                        32,
-                        20,
-                        3,
-                        height + 34,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27085, 0, 16, 32, 20, 3, height + 34, 0, 6,
                         height + 34);
                     break;
             }
@@ -6785,11 +3949,7 @@ static void compact_inverted_rc_track_half_loop_up(
 
 /** rct2: 0x008AEA50 */
 static void compact_inverted_rc_track_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, tileElement);
@@ -6797,11 +3957,7 @@ static void compact_inverted_rc_track_half_loop_down(
 
 /** rct2: 0x008AEA60 */
 static void compact_inverted_rc_track_left_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6811,62 +3967,22 @@ static void compact_inverted_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27049,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27049, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27052,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27052, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27055,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27055, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27058,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27058, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
             }
@@ -6875,8 +3991,7 @@ static void compact_inverted_rc_track_left_corkscrew_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -6891,62 +4006,22 @@ static void compact_inverted_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27050,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27050, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27053,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27053, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27056,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27056, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27059,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27059, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
             }
@@ -6958,62 +4033,22 @@ static void compact_inverted_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27051,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27051, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27054,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27054, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27057,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27057, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27060,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27060, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
             }
@@ -7032,8 +4067,7 @@ static void compact_inverted_rc_track_left_corkscrew_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
     }
@@ -7041,11 +4075,7 @@ static void compact_inverted_rc_track_left_corkscrew_up(
 
 /** rct2: 0x008AEA70 */
 static void compact_inverted_rc_track_right_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7055,62 +4085,22 @@ static void compact_inverted_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27061,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27061, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27064,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27064, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27067,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27067, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27070,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27070, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
             }
@@ -7119,8 +4109,7 @@ static void compact_inverted_rc_track_right_corkscrew_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -7135,62 +4124,22 @@ static void compact_inverted_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27062,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27062, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27065,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27065, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27068,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27068, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27071,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27071, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
             }
@@ -7202,62 +4151,22 @@ static void compact_inverted_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27063,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27063, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27066,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27066, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27069,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27069, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27072,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27072, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
             }
@@ -7276,8 +4185,7 @@ static void compact_inverted_rc_track_right_corkscrew_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
     }
@@ -7285,11 +4193,7 @@ static void compact_inverted_rc_track_right_corkscrew_up(
 
 /** rct2: 0x008AEA80 */
 static void compact_inverted_rc_track_left_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_right_corkscrew_up(
@@ -7298,11 +4202,7 @@ static void compact_inverted_rc_track_left_corkscrew_down(
 
 /** rct2: 0x008AEA90 */
 static void compact_inverted_rc_track_right_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_left_corkscrew_up(
@@ -7311,11 +4211,7 @@ static void compact_inverted_rc_track_right_corkscrew_down(
 
 /** rct2: 0x008AEAD0 */
 static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -7324,68 +4220,28 @@ static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_up(
             sub_98197C_rotated(
                 session, direction, session->TrackColours[SCHEME_TRACK] | 26910, 0, 0, 28, 28, 3, height + 5, 2, 2, height + 5);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26906,
-                0,
-                0,
-                28,
-                28,
-                1,
-                height + 5,
-                2,
-                2,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26906, 0, 0, 28, 28, 1, height + 5, 2, 2,
                 height + 104);
             break;
         case 1:
             sub_98197C_rotated(
                 session, direction, session->TrackColours[SCHEME_TRACK] | 26911, 0, 0, 28, 28, 3, height + 5, 2, 2, height + 5);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26907,
-                0,
-                0,
-                28,
-                28,
-                1,
-                height + 5,
-                2,
-                2,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26907, 0, 0, 28, 28, 1, height + 5, 2, 2,
                 height + 104);
             break;
         case 2:
             sub_98197C_rotated(
                 session, direction, session->TrackColours[SCHEME_TRACK] | 26912, 0, 0, 28, 28, 3, height + 5, 2, 2, height + 5);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26908,
-                0,
-                0,
-                28,
-                28,
-                1,
-                height + 5,
-                2,
-                2,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26908, 0, 0, 28, 28, 1, height + 5, 2, 2,
                 height + 104);
             break;
         case 3:
             sub_98197C_rotated(
                 session, direction, session->TrackColours[SCHEME_TRACK] | 26909, 0, 0, 28, 28, 3, height + 5, 2, 2, height + 5);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26905,
-                0,
-                0,
-                28,
-                28,
-                1,
-                height + 5,
-                2,
-                2,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26905, 0, 0, 28, 28, 1, height + 5, 2, 2,
                 height + 104);
             break;
     }
@@ -7396,11 +4252,7 @@ static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008AEAB0 */
 static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -7409,68 +4261,28 @@ static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_up(
             sub_98197C_rotated(
                 session, direction, session->TrackColours[SCHEME_TRACK] | 26901, 0, 0, 28, 28, 3, height + 5, 2, 2, height + 5);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26897,
-                0,
-                0,
-                28,
-                28,
-                1,
-                height + 5,
-                2,
-                2,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26897, 0, 0, 28, 28, 1, height + 5, 2, 2,
                 height + 104);
             break;
         case 1:
             sub_98197C_rotated(
                 session, direction, session->TrackColours[SCHEME_TRACK] | 26902, 0, 0, 28, 28, 3, height + 5, 2, 2, height + 5);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26898,
-                0,
-                0,
-                28,
-                28,
-                1,
-                height + 5,
-                2,
-                2,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26898, 0, 0, 28, 28, 1, height + 5, 2, 2,
                 height + 104);
             break;
         case 2:
             sub_98197C_rotated(
                 session, direction, session->TrackColours[SCHEME_TRACK] | 26903, 0, 0, 28, 28, 3, height + 5, 2, 2, height + 5);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26899,
-                0,
-                0,
-                28,
-                28,
-                1,
-                height + 5,
-                2,
-                2,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26899, 0, 0, 28, 28, 1, height + 5, 2, 2,
                 height + 104);
             break;
         case 3:
             sub_98197C_rotated(
                 session, direction, session->TrackColours[SCHEME_TRACK] | 26904, 0, 0, 28, 28, 3, height + 5, 2, 2, height + 5);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26900,
-                0,
-                0,
-                28,
-                28,
-                1,
-                height + 5,
-                2,
-                2,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26900, 0, 0, 28, 28, 1, height + 5, 2, 2,
                 height + 104);
             break;
     }
@@ -7481,11 +4293,7 @@ static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008AEAC0 */
 static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_right_quarter_turn_1_60_deg_up(
@@ -7494,11 +4302,7 @@ static void compact_inverted_rc_track_left_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008AEAE0 */
 static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_left_quarter_turn_1_60_deg_up(
@@ -7507,11 +4311,7 @@ static void compact_inverted_rc_track_right_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008AEAA0 */
 static void compact_inverted_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -7519,33 +4319,13 @@ static void compact_inverted_rc_track_brakes(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26559,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26559, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26560,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26560, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -7564,11 +4344,7 @@ static void compact_inverted_rc_track_brakes(
 
 /** rct2: 0x008AEAF0 */
 static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7578,71 +4354,29 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27118,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27118, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27123,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27123, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27128,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27128, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27113,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27113, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -7660,62 +4394,22 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27117,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27117, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27122,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27122, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27127,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27127, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27112,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27112, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
             }
@@ -7723,8 +4417,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -7732,62 +4425,22 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27116,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27116, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27121,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27121, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27126,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27126, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27111,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27111, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
             }
@@ -7803,62 +4456,22 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27115,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27115, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27120,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27120, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27125,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27125, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27110,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27110, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
             }
@@ -7866,8 +4479,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -7875,71 +4487,29 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27114,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27114, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27119,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27119, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27124,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27124, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27109,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27109, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 56, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -7959,11 +4529,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_up(
 
 /** rct2: 0x008AEB00 */
 static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7973,71 +4539,29 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27089,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27089, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27094,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27094, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27099,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27099, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27104,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27104, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8055,62 +4579,22 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27090,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27090, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27095,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27095, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27100,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27100, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27105,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27105, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
             }
@@ -8118,8 +4602,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -8127,62 +4610,22 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27091,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27091, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27096,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27096, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27101,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27101, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27106,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27106, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
             }
@@ -8198,62 +4641,22 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27092,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27092, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27097,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27097, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27102,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27102, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27107,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27107, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
             }
@@ -8261,8 +4664,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -8270,71 +4672,29 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27093,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27093, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27098,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27098, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27103,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27103, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27108,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27108, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 56, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8354,11 +4714,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_up(
 
 /** rct2: 0x008AEB10 */
 static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8368,71 +4724,29 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27098,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27098, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27103,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27103, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27108,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27108, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27093,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27093, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 56, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8450,62 +4764,22 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27097,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27097, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27102,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27102, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27107,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27107, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27092,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27092, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
             }
@@ -8513,8 +4787,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -8522,62 +4795,22 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27096,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27096, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27101,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27101, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27106,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27106, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27091,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27091, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
             }
@@ -8593,62 +4826,22 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27095,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27095, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27100,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27100, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27105,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27105, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27090,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27090, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
             }
@@ -8656,8 +4849,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -8665,71 +4857,29 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27094,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27094, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27099,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27099, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27104,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27104, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27089,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27089, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8749,11 +4899,7 @@ static void compact_inverted_rc_track_left_quarter_banked_helix_large_down(
 
 /** rct2: 0x008AEB20 */
 static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8763,71 +4909,29 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27109,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27109, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27114,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27114, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27119,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27119, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27124,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27124, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 56, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8845,62 +4949,22 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27110,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27110, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27115,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27115, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27120,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27120, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27125,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27125, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
             }
@@ -8908,8 +4972,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -8917,62 +4980,22 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27111,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27111, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27116,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27116, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27121,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27121, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27126,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27126, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
             }
@@ -8988,62 +5011,22 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27112,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27112, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27117,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27117, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27122,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27122, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27127,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27127, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
             }
@@ -9051,8 +5034,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -9060,71 +5042,29 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27113,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27113, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27118,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27118, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27123,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27123, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27128,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27128, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -9144,11 +5084,7 @@ static void compact_inverted_rc_track_right_quarter_banked_helix_large_down(
 
 /** rct2: 0x008AEB30 */
 static void compact_inverted_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -9160,17 +5096,7 @@ static void compact_inverted_rc_track_on_ride_photo(
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26555,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26555, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
@@ -9180,17 +5106,7 @@ static void compact_inverted_rc_track_on_ride_photo(
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26556,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26556, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 2:
@@ -9200,17 +5116,7 @@ static void compact_inverted_rc_track_on_ride_photo(
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26555,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26555, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 3:
@@ -9220,17 +5126,7 @@ static void compact_inverted_rc_track_on_ride_photo(
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26556,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26556, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -9242,11 +5138,7 @@ static void compact_inverted_rc_track_on_ride_photo(
 
 /** rct2: 0x008AEDB0 */
 static void compact_inverted_rc_track_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9258,62 +5150,22 @@ static void compact_inverted_rc_track_90_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26609,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 29,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26609, 0, 0, 32, 20, 3, height + 29, 0, 6,
                             height + 61);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26610,
-                            0,
-                            0,
-                            32,
-                            2,
-                            31,
-                            height + 29,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26610, 0, 0, 32, 2, 31, height + 29, 0, 4,
                             height + 11);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26611,
-                            0,
-                            0,
-                            32,
-                            2,
-                            31,
-                            height + 29,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26611, 0, 0, 32, 2, 31, height + 29, 0, 4,
                             height + 11);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26612,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 29,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26612, 0, 0, 32, 20, 3, height + 29, 0, 6,
                             height + 61);
                         break;
                 }
@@ -9324,62 +5176,22 @@ static void compact_inverted_rc_track_90_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26605,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 29,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26605, 0, 0, 32, 20, 3, height + 29, 0, 6,
                             height + 61);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26606,
-                            0,
-                            0,
-                            32,
-                            2,
-                            31,
-                            height + 29,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26606, 0, 0, 32, 2, 31, height + 29, 0, 4,
                             height + 11);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26607,
-                            0,
-                            0,
-                            32,
-                            2,
-                            31,
-                            height + 29,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26607, 0, 0, 32, 2, 31, height + 29, 0, 4,
                             height + 11);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26608,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 29,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26608, 0, 0, 32, 20, 3, height + 29, 0, 6,
                             height + 61);
                         break;
                 }
@@ -9396,11 +5208,7 @@ static void compact_inverted_rc_track_90_deg_up(
 
 /** rct2: 0x008AEDC0 */
 static void compact_inverted_rc_track_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -9408,11 +5216,7 @@ static void compact_inverted_rc_track_90_deg_down(
 
 /** rct2: 0x008AED70 */
 static void compact_inverted_rc_track_60_deg_up_to_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9424,62 +5228,22 @@ static void compact_inverted_rc_track_60_deg_up_to_90_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26597,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 29,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26597, 0, 0, 32, 20, 3, height + 29, 0, 6,
                             height + 85);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26598,
-                            0,
-                            0,
-                            32,
-                            2,
-                            55,
-                            height + 29,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26598, 0, 0, 32, 2, 55, height + 29, 0, 4,
                             height + 11);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26599,
-                            0,
-                            0,
-                            32,
-                            2,
-                            55,
-                            height + 29,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26599, 0, 0, 32, 2, 55, height + 29, 0, 4,
                             height + 11);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26600,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 29,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26600, 0, 0, 32, 20, 3, height + 29, 0, 6,
                             height + 85);
                         break;
                 }
@@ -9490,62 +5254,22 @@ static void compact_inverted_rc_track_60_deg_up_to_90_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26589,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 29,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26589, 0, 0, 32, 20, 3, height + 29, 0, 6,
                             height + 85);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26590,
-                            0,
-                            0,
-                            32,
-                            2,
-                            55,
-                            height + 29,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26590, 0, 0, 32, 2, 55, height + 29, 0, 4,
                             height + 11);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26591,
-                            0,
-                            0,
-                            32,
-                            2,
-                            55,
-                            height + 29,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26591, 0, 0, 32, 2, 55, height + 29, 0, 4,
                             height + 11);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26592,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 29,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26592, 0, 0, 32, 20, 3, height + 29, 0, 6,
                             height + 85);
                         break;
                 }
@@ -9566,11 +5290,7 @@ static void compact_inverted_rc_track_60_deg_up_to_90_deg_up(
 
 /** rct2: 0x008AED80 */
 static void compact_inverted_rc_track_90_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     compact_inverted_rc_track_60_deg_up_to_90_deg_up(
@@ -9579,11 +5299,7 @@ static void compact_inverted_rc_track_90_deg_down_to_60_deg_down(
 
 /** rct2: 0x008AED90 */
 static void compact_inverted_rc_track_90_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -9592,62 +5308,22 @@ static void compact_inverted_rc_track_90_deg_up_to_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26601,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26601, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 85);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26602,
-                    0,
-                    0,
-                    32,
-                    2,
-                    55,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26602, 0, 0, 32, 2, 55, height + 29, 0, 4,
                     height + 11);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26603,
-                    0,
-                    0,
-                    32,
-                    2,
-                    55,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26603, 0, 0, 32, 2, 55, height + 29, 0, 4,
                     height + 11);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26604,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26604, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 85);
                 break;
         }
@@ -9658,62 +5334,22 @@ static void compact_inverted_rc_track_90_deg_up_to_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26593,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26593, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 85);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26594,
-                    0,
-                    0,
-                    32,
-                    2,
-                    55,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26594, 0, 0, 32, 2, 55, height + 29, 0, 4,
                     height + 11);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26595,
-                    0,
-                    0,
-                    32,
-                    2,
-                    55,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26595, 0, 0, 32, 2, 55, height + 29, 0, 4,
                     height + 11);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26596,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26596, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 85);
                 break;
         }
@@ -9734,11 +5370,7 @@ static void compact_inverted_rc_track_90_deg_up_to_60_deg_up(
 
 /** rct2: 0x008AEDA0 */
 static void compact_inverted_rc_track_60_deg_down_to_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9750,62 +5382,22 @@ static void compact_inverted_rc_track_60_deg_down_to_90_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26603,
-                            0,
-                            0,
-                            32,
-                            2,
-                            55,
-                            height + 29,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26603, 0, 0, 32, 2, 55, height + 29, 0, 4,
                             height + 11);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26604,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 29,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26604, 0, 0, 32, 20, 3, height + 29, 0, 6,
                             height + 85);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26601,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 29,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26601, 0, 0, 32, 20, 3, height + 29, 0, 6,
                             height + 85);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26602,
-                            0,
-                            0,
-                            32,
-                            2,
-                            55,
-                            height + 29,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26602, 0, 0, 32, 2, 55, height + 29, 0, 4,
                             height + 11);
                         break;
                 }
@@ -9816,62 +5408,22 @@ static void compact_inverted_rc_track_60_deg_down_to_90_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26595,
-                            0,
-                            0,
-                            32,
-                            2,
-                            55,
-                            height + 29,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26595, 0, 0, 32, 2, 55, height + 29, 0, 4,
                             height + 11);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26596,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 29,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26596, 0, 0, 32, 20, 3, height + 29, 0, 6,
                             height + 85);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26593,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 29,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26593, 0, 0, 32, 20, 3, height + 29, 0, 6,
                             height + 85);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26594,
-                            0,
-                            0,
-                            32,
-                            2,
-                            55,
-                            height + 29,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26594, 0, 0, 32, 2, 55, height + 29, 0, 4,
                             height + 11);
                         break;
                 }
@@ -9891,11 +5443,7 @@ static void compact_inverted_rc_track_60_deg_down_to_90_deg_down(
 
 /** rct2: 0x008AEB40 */
 static void compact_inverted_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9905,62 +5453,22 @@ static void compact_inverted_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26765,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26765, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26769,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26769, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26773,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26773, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26777,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26777, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -9981,62 +5489,22 @@ static void compact_inverted_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26766,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26766, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26770,
-                        0,
-                        0,
-                        34,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26770, 0, 0, 34, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26774,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26774, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26778,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26778, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
@@ -10044,8 +5512,7 @@ static void compact_inverted_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -10053,70 +5520,28 @@ static void compact_inverted_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26767,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26767, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26771,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26771, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26775,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26775, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26779,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26779, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -10129,62 +5554,22 @@ static void compact_inverted_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26768,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26768, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26772,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26772, 0, 0, 16, 18, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26776,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26776, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26780,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26780, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
             }
@@ -10193,8 +5578,7 @@ static void compact_inverted_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -10222,11 +5606,7 @@ static void compact_inverted_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x008AEB50 */
 static void compact_inverted_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10236,62 +5616,22 @@ static void compact_inverted_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26749,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26749, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26753,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26753, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26757,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26757, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26761,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26761, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -10312,62 +5652,22 @@ static void compact_inverted_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26750,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26750, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26754,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26754, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26758,
-                        0,
-                        0,
-                        34,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26758, 0, 0, 34, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26762,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26762, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
             }
@@ -10375,8 +5675,7 @@ static void compact_inverted_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -10384,70 +5683,28 @@ static void compact_inverted_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26751,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26751, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26755,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26755, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26759,
-                        0,
-                        0,
-                        28,
-                        28,
-                        3,
-                        height + 29,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26759, 0, 0, 28, 28, 3, height + 29, 4, 4,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26763,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26763, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -10460,62 +5717,22 @@ static void compact_inverted_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26752,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26752, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26756,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26756, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26760,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26760, 0, 0, 16, 18, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26764,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26764, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
             }
@@ -10524,8 +5741,7 @@ static void compact_inverted_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -10553,11 +5769,7 @@ static void compact_inverted_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x008AEB60 */
 static void compact_inverted_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -10566,11 +5778,7 @@ static void compact_inverted_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008AEB70 */
 static void compact_inverted_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -10579,11 +5787,7 @@ static void compact_inverted_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008AED30 */
 static void compact_inverted_rc_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10593,62 +5797,22 @@ static void compact_inverted_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26853,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26853, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26857,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26857, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26861,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26861, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26865,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26865, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -10669,62 +5833,22 @@ static void compact_inverted_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26854,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26854, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26858,
-                        0,
-                        0,
-                        34,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26858, 0, 0, 34, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26862,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26862, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26866,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26866, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
@@ -10732,8 +5856,7 @@ static void compact_inverted_rc_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -10741,70 +5864,28 @@ static void compact_inverted_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26855,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26855, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26859,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26859, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26863,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26863, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26867,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26867, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -10817,62 +5898,22 @@ static void compact_inverted_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26856,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26856, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26860,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26860, 0, 0, 16, 18, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26864,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26864, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26868,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26868, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
             }
@@ -10881,8 +5922,7 @@ static void compact_inverted_rc_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -10910,11 +5950,7 @@ static void compact_inverted_rc_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x008AED40 */
 static void compact_inverted_rc_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10924,62 +5960,22 @@ static void compact_inverted_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26837,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26837, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26841,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26841, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26845,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26845, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26849,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26849, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -11000,62 +5996,22 @@ static void compact_inverted_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26838,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26838, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26842,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26842, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26846,
-                        0,
-                        0,
-                        34,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26846, 0, 0, 34, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26850,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26850, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
             }
@@ -11063,8 +6019,7 @@ static void compact_inverted_rc_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -11072,70 +6027,28 @@ static void compact_inverted_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26839,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26839, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26843,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26843, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26847,
-                        0,
-                        0,
-                        28,
-                        28,
-                        3,
-                        height + 29,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26847, 0, 0, 28, 28, 3, height + 29, 4, 4,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26851,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26851, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -11148,62 +6061,22 @@ static void compact_inverted_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26840,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26840, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26844,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26844, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26848,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26848, 0, 0, 16, 18, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26852,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26852, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
             }
@@ -11212,8 +6085,7 @@ static void compact_inverted_rc_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -11241,11 +6113,7 @@ static void compact_inverted_rc_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x008AED50 */
 static void compact_inverted_rc_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -11255,11 +6123,7 @@ static void compact_inverted_rc_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008AED60 */
 static void compact_inverted_rc_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -11269,11 +6133,7 @@ static void compact_inverted_rc_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008AEB80 */
 static void compact_inverted_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11285,18 +6145,8 @@ static void compact_inverted_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26812,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26812, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -11306,18 +6156,8 @@ static void compact_inverted_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26784,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26784, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -11332,18 +6172,8 @@ static void compact_inverted_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26809,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26809, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -11353,18 +6183,8 @@ static void compact_inverted_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26781,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26781, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -11379,18 +6199,8 @@ static void compact_inverted_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26811,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26811, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -11400,18 +6210,8 @@ static void compact_inverted_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26783,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26783, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -11426,18 +6226,8 @@ static void compact_inverted_rc_track_diag_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26810,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26810, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -11447,18 +6237,8 @@ static void compact_inverted_rc_track_diag_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26782,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26782, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -11492,11 +6272,7 @@ static void compact_inverted_rc_track_diag_flat(
 
 /** rct2: 0x008AEBB0 */
 static void compact_inverted_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11508,18 +6284,8 @@ static void compact_inverted_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26824,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26824, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11529,18 +6295,8 @@ static void compact_inverted_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26796,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26796, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11555,18 +6311,8 @@ static void compact_inverted_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26821,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26821, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11576,18 +6322,8 @@ static void compact_inverted_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26793,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26793, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11602,18 +6338,8 @@ static void compact_inverted_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26823,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26823, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11623,18 +6349,8 @@ static void compact_inverted_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26795,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26795, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11649,18 +6365,8 @@ static void compact_inverted_rc_track_diag_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26822,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26822, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11670,18 +6376,8 @@ static void compact_inverted_rc_track_diag_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26794,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26794, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11715,11 +6411,7 @@ static void compact_inverted_rc_track_diag_25_deg_up(
 
 /** rct2: 0x008AEC10 */
 static void compact_inverted_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11729,18 +6421,8 @@ static void compact_inverted_rc_track_diag_60_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26808,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26808, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -11752,18 +6434,8 @@ static void compact_inverted_rc_track_diag_60_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26805,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26805, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -11775,18 +6447,8 @@ static void compact_inverted_rc_track_diag_60_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26807,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26807, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -11798,18 +6460,8 @@ static void compact_inverted_rc_track_diag_60_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26806,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26806, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
@@ -11842,11 +6494,7 @@ static void compact_inverted_rc_track_diag_60_deg_up(
 
 /** rct2: 0x008AEB90 */
 static void compact_inverted_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11858,18 +6506,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26816,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26816, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11879,18 +6517,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26788,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26788, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11905,18 +6533,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26813,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26813, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11926,18 +6544,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26785,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26785, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11952,18 +6560,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26815,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26815, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11973,18 +6571,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26787,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26787, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11999,18 +6587,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26814,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26814, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12020,18 +6598,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26786,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26786, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12065,11 +6633,7 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008AEBF0 */
 static void compact_inverted_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12079,18 +6643,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26800,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26800, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12102,18 +6656,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26797,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26797, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12125,18 +6669,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26799,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26799, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12148,18 +6682,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26798,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26798, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
 
@@ -12192,11 +6716,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008AEC00 */
 static void compact_inverted_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12206,18 +6726,8 @@ static void compact_inverted_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26804,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26804, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12229,18 +6739,8 @@ static void compact_inverted_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26801,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26801, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12252,18 +6752,8 @@ static void compact_inverted_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26803,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26803, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12275,17 +6765,7 @@ static void compact_inverted_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26802,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26802, -16, -16, 16, 16, 3, height + 29, 0, 0,
                         height + 61);
                     break;
             }
@@ -12319,11 +6799,7 @@ static void compact_inverted_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008AEBA0 */
 static void compact_inverted_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12335,18 +6811,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26820,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26820, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12356,18 +6822,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26792,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26792, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12382,18 +6838,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26817,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26817, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12403,18 +6849,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26789,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26789, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12429,18 +6865,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26819,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26819, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12450,18 +6876,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26791,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26791, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12476,18 +6892,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26818,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26818, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12497,18 +6903,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26790,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26790, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12542,11 +6938,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008AEBE0 */
 static void compact_inverted_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12558,18 +6950,8 @@ static void compact_inverted_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26822,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26822, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -12579,18 +6961,8 @@ static void compact_inverted_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26794,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26794, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -12605,18 +6977,8 @@ static void compact_inverted_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26823,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26823, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -12626,18 +6988,8 @@ static void compact_inverted_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26795,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26795, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -12652,18 +7004,8 @@ static void compact_inverted_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26821,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26821, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -12673,18 +7015,8 @@ static void compact_inverted_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26793,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26793, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -12699,18 +7031,8 @@ static void compact_inverted_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26824,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26824, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -12720,18 +7042,8 @@ static void compact_inverted_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26796,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26796, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -12765,11 +7077,7 @@ static void compact_inverted_rc_track_diag_25_deg_down(
 
 /** rct2: 0x008AEC40 */
 static void compact_inverted_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12779,18 +7087,8 @@ static void compact_inverted_rc_track_diag_60_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26806,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26806, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12802,18 +7100,8 @@ static void compact_inverted_rc_track_diag_60_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26807,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26807, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12825,18 +7113,8 @@ static void compact_inverted_rc_track_diag_60_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26805,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26805, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12848,18 +7126,8 @@ static void compact_inverted_rc_track_diag_60_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26808,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26808, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
 
@@ -12892,11 +7160,7 @@ static void compact_inverted_rc_track_diag_60_deg_down(
 
 /** rct2: 0x008AEBC0 */
 static void compact_inverted_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12908,18 +7172,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26818,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26818, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12929,18 +7183,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26790,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26790, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12954,18 +7198,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26819,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26819, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12975,18 +7209,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26791,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26791, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -13000,18 +7224,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26817,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26817, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -13021,18 +7235,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26789,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26789, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -13046,18 +7250,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26820,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26820, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -13067,18 +7261,8 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26792,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26792, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -13112,11 +7296,7 @@ static void compact_inverted_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008AEC20 */
 static void compact_inverted_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13126,17 +7306,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26802,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26802, -16, -16, 16, 16, 3, height + 29, 0, 0,
                         height + 61);
                     break;
             }
@@ -13149,18 +7319,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26803,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26803, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13172,18 +7332,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26801,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26801, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13195,18 +7345,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26804,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26804, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
 
@@ -13239,11 +7379,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008AEC30 */
 static void compact_inverted_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13253,18 +7389,8 @@ static void compact_inverted_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26798,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26798, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13276,18 +7402,8 @@ static void compact_inverted_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26799,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26799, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13299,18 +7415,8 @@ static void compact_inverted_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26797,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26797, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13322,18 +7428,8 @@ static void compact_inverted_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26800,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26800, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
 
@@ -13366,11 +7462,7 @@ static void compact_inverted_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008AEBD0 */
 static void compact_inverted_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13382,18 +7474,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26814,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26814, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -13403,18 +7485,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26786,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26786, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -13429,18 +7501,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26815,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26815, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -13450,18 +7512,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26787,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26787, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -13476,18 +7528,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26813,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26813, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -13497,18 +7539,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26785,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26785, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -13523,18 +7555,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26816,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26816, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -13544,18 +7566,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26788,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26788, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -13589,11 +7601,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x008AEC70 */
 static void compact_inverted_rc_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13603,18 +7611,8 @@ static void compact_inverted_rc_track_diag_flat_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26876,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26876, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13626,18 +7624,8 @@ static void compact_inverted_rc_track_diag_flat_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26873,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26873, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13649,18 +7637,8 @@ static void compact_inverted_rc_track_diag_flat_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26875,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26875, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13672,26 +7650,14 @@ static void compact_inverted_rc_track_diag_flat_to_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26874,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26874, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -13719,11 +7685,7 @@ static void compact_inverted_rc_track_diag_flat_to_left_bank(
 
 /** rct2: 0x008AEC80 */
 static void compact_inverted_rc_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13733,18 +7695,8 @@ static void compact_inverted_rc_track_diag_flat_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26880,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26880, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13756,18 +7708,8 @@ static void compact_inverted_rc_track_diag_flat_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26877,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26877, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13779,18 +7721,8 @@ static void compact_inverted_rc_track_diag_flat_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26879,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26879, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13802,26 +7734,14 @@ static void compact_inverted_rc_track_diag_flat_to_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26878,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26878, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -13849,11 +7769,7 @@ static void compact_inverted_rc_track_diag_flat_to_right_bank(
 
 /** rct2: 0x008AEC90 */
 static void compact_inverted_rc_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13863,18 +7779,8 @@ static void compact_inverted_rc_track_diag_left_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26878,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26878, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13886,18 +7792,8 @@ static void compact_inverted_rc_track_diag_left_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26879,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26879, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13909,18 +7805,8 @@ static void compact_inverted_rc_track_diag_left_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26877,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26877, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13932,26 +7818,14 @@ static void compact_inverted_rc_track_diag_left_bank_to_flat(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26880,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26880, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -13979,11 +7853,7 @@ static void compact_inverted_rc_track_diag_left_bank_to_flat(
 
 /** rct2: 0x008AECA0 */
 static void compact_inverted_rc_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13993,18 +7863,8 @@ static void compact_inverted_rc_track_diag_right_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26874,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26874, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14016,18 +7876,8 @@ static void compact_inverted_rc_track_diag_right_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26875,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26875, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14039,18 +7889,8 @@ static void compact_inverted_rc_track_diag_right_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26873,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26873, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14062,26 +7902,14 @@ static void compact_inverted_rc_track_diag_right_bank_to_flat(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26876,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26876, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -14109,11 +7937,7 @@ static void compact_inverted_rc_track_diag_right_bank_to_flat(
 
 /** rct2: 0x008AECD0 */
 static void compact_inverted_rc_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14123,18 +7947,8 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26892,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26892, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14146,18 +7960,8 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26889,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26889, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14169,18 +7973,8 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26891,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26891, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14192,18 +7986,8 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26890,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26890, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -14236,11 +8020,7 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x008AECE0 */
 static void compact_inverted_rc_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14250,18 +8030,8 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26896,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26896, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14273,18 +8043,8 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26893,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26893, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14296,18 +8056,8 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26895,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26895, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14319,18 +8069,8 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26894,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26894, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -14363,11 +8103,7 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x008AECB0 */
 static void compact_inverted_rc_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14377,18 +8113,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26884,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26884, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14400,18 +8126,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26881,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26881, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14423,18 +8139,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26883,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26883, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14446,18 +8152,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26882,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26882, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -14490,11 +8186,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x008AECC0 */
 static void compact_inverted_rc_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14504,18 +8196,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26888,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26888, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14527,18 +8209,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26885,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26885, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14550,18 +8222,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26887,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26887, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14573,18 +8235,8 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26886,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26886, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -14617,11 +8269,7 @@ static void compact_inverted_rc_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x008AECF0 */
 static void compact_inverted_rc_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14631,18 +8279,8 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26886,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26886, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14653,18 +8291,8 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26887,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26887, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14675,18 +8303,8 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26885,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26885, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14697,18 +8315,8 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26888,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26888, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -14741,11 +8349,7 @@ static void compact_inverted_rc_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x008AED00 */
 static void compact_inverted_rc_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14755,18 +8359,8 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26882,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26882, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14777,18 +8371,8 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26883,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26883, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14799,18 +8383,8 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26881,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26881, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14821,18 +8395,8 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26884,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26884, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -14865,11 +8429,7 @@ static void compact_inverted_rc_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x008AED10 */
 static void compact_inverted_rc_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14879,18 +8439,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26894,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26894, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14902,18 +8452,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26895,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26895, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14925,18 +8465,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26893,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26893, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14948,18 +8478,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26896,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26896, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -14992,11 +8512,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x008AED20 */
 static void compact_inverted_rc_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -15006,18 +8522,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26890,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26890, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -15029,18 +8535,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26891,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26891, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -15052,18 +8548,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26889,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26889, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -15075,18 +8561,8 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26892,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26892, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -15119,11 +8595,7 @@ static void compact_inverted_rc_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x008AEC50 */
 static void compact_inverted_rc_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -15133,18 +8605,8 @@ static void compact_inverted_rc_track_diag_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26872,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26872, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -15156,18 +8618,8 @@ static void compact_inverted_rc_track_diag_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26869,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26869, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -15179,18 +8631,8 @@ static void compact_inverted_rc_track_diag_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26871,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26871, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -15202,26 +8644,14 @@ static void compact_inverted_rc_track_diag_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26870,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26870, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -15249,11 +8679,7 @@ static void compact_inverted_rc_track_diag_left_bank(
 
 /** rct2: 0x008AEC60 */
 static void compact_inverted_rc_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -15263,18 +8689,8 @@ static void compact_inverted_rc_track_diag_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26870,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26870, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -15286,18 +8702,8 @@ static void compact_inverted_rc_track_diag_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26871,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26871, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -15309,18 +8715,8 @@ static void compact_inverted_rc_track_diag_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26869,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26869, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -15332,26 +8728,14 @@ static void compact_inverted_rc_track_diag_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26872,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26872, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -15379,11 +8763,7 @@ static void compact_inverted_rc_track_diag_right_bank(
 
 /** rct2: 0x008AEAA0 */
 static void compact_inverted_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -15391,33 +8771,13 @@ static void compact_inverted_rc_track_block_brakes(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26559,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26559, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26560,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26560, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
diff --git a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp
index 9758ba402e..f4e026d6a8 100644
--- a/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/CorkscrewRollerCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x008A7AF8 */
 static void corkscrew_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -82,11 +78,7 @@ static void corkscrew_rc_track_flat(
 
 /** rct2: 0x008A7D68, 0x008A7D78, 0x008A7D88 */
 static void corkscrew_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -99,33 +91,13 @@ static void corkscrew_rc_track_station(
     if (track_element_get_type(tileElement) == TRACK_ELEM_END_STATION)
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            1,
-            height,
-            0,
-            6,
+            session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
             height + 3);
     }
     else
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            1,
-            height,
-            0,
-            6,
+            session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
             height + 3);
     }
     sub_98196C_rotated(
@@ -139,11 +111,7 @@ static void corkscrew_rc_track_station(
 
 /** rct2: 0x008A7B08 */
 static void corkscrew_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -213,11 +181,7 @@ static void corkscrew_rc_track_25_deg_up(
 
 /** rct2: 0x008A7B18 */
 static void corkscrew_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -287,11 +251,7 @@ static void corkscrew_rc_track_60_deg_up(
 
 /** rct2: 0x008A7B28 */
 static void corkscrew_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -361,11 +321,7 @@ static void corkscrew_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x008A7B38 */
 static void corkscrew_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -443,11 +399,7 @@ static void corkscrew_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008A7B48 */
 static void corkscrew_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -525,11 +477,7 @@ static void corkscrew_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A7B58 */
 static void corkscrew_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -599,11 +547,7 @@ static void corkscrew_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x008A7B68 */
 static void corkscrew_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -611,11 +555,7 @@ static void corkscrew_rc_track_25_deg_down(
 
 /** rct2: 0x008A7B78 */
 static void corkscrew_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -623,11 +563,7 @@ static void corkscrew_rc_track_60_deg_down(
 
 /** rct2: 0x008A7B88 */
 static void corkscrew_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -635,11 +571,7 @@ static void corkscrew_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008A7B98 */
 static void corkscrew_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -647,11 +579,7 @@ static void corkscrew_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008A7BA8 */
 static void corkscrew_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -659,11 +587,7 @@ static void corkscrew_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A7BB8 */
 static void corkscrew_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -671,11 +595,7 @@ static void corkscrew_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x008A7BC8 */
 static void corkscrew_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -725,32 +645,12 @@ static void corkscrew_rc_track_left_quarter_turn_5(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16352,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16352, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16337,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16337, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -758,8 +658,7 @@ static void corkscrew_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -767,47 +666,17 @@ static void corkscrew_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16341,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16341, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16346,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16346, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16351,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16351, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -827,17 +696,7 @@ static void corkscrew_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16340,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16340, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -850,17 +709,7 @@ static void corkscrew_rc_track_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16335,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16335, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -868,8 +717,7 @@ static void corkscrew_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -911,11 +759,7 @@ static void corkscrew_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x008A7BD8 */
 static void corkscrew_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -924,11 +768,7 @@ static void corkscrew_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x008A7BE8 */
 static void corkscrew_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -966,11 +806,7 @@ static void corkscrew_rc_track_flat_to_left_bank(
 
 /** rct2: 0x008A7BF8 */
 static void corkscrew_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1008,11 +844,7 @@ static void corkscrew_rc_track_flat_to_right_bank(
 
 /** rct2: 0x008A7C08 */
 static void corkscrew_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1050,11 +882,7 @@ static void corkscrew_rc_track_left_bank_to_flat(
 
 /** rct2: 0x008A7C18 */
 static void corkscrew_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1092,11 +920,7 @@ static void corkscrew_rc_track_right_bank_to_flat(
 
 /** rct2: 0x008A7C28 */
 static void corkscrew_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1108,32 +932,12 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16363, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16374,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16374, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16368,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16368, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -1166,47 +970,17 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16367,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16367, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16372,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16372, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16357,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16357, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -1214,8 +988,7 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -1223,47 +996,17 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16361,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16361, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16366,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16366, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16371,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16371, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -1283,32 +1026,12 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16360,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16360, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16365,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16365, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -1317,17 +1040,7 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16355,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16355, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -1335,8 +1048,7 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -1348,34 +1060,14 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16364,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16364, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16369, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16375,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16375, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -1402,11 +1094,7 @@ static void corkscrew_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x008A7C38 */
 static void corkscrew_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1415,11 +1103,7 @@ static void corkscrew_rc_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x008A7C48 */
 static void corkscrew_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1464,11 +1148,7 @@ static void corkscrew_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x008A7C58 */
 static void corkscrew_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1513,11 +1193,7 @@ static void corkscrew_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x008A7C68 */
 static void corkscrew_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1562,11 +1238,7 @@ static void corkscrew_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x008A7C78 */
 static void corkscrew_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1611,11 +1283,7 @@ static void corkscrew_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x008A7C88 */
 static void corkscrew_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1623,11 +1291,7 @@ static void corkscrew_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x008A7C98 */
 static void corkscrew_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1635,11 +1299,7 @@ static void corkscrew_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x008A7CA8 */
 static void corkscrew_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1647,11 +1307,7 @@ static void corkscrew_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x008A7CB8 */
 static void corkscrew_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1659,11 +1315,7 @@ static void corkscrew_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x008A7CC8 */
 static void corkscrew_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1697,11 +1349,7 @@ static void corkscrew_rc_track_left_bank(
 
 /** rct2: 0x008A7CD8 */
 static void corkscrew_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1709,11 +1357,7 @@ static void corkscrew_rc_track_right_bank(
 
 /** rct2: 0x008A7CE8 */
 static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1763,32 +1407,12 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16521,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16521, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16526,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16526, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -1796,8 +1420,7 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -1805,47 +1428,17 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16512,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16512, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16517,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16517, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16522,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16522, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -1865,17 +1458,7 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16513,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16513, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -1888,17 +1471,7 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16528,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16528, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -1906,8 +1479,7 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -1949,11 +1521,7 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A7CF8 */
 static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1995,32 +1563,12 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16491,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16491, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16496,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16496, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -2036,8 +1584,7 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -2049,47 +1596,17 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16497,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16497, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16502,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16502, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16507,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16507, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -2105,17 +1622,7 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16493,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16493, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -2128,17 +1635,7 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16508,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16508, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -2146,8 +1643,7 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -2189,11 +1685,7 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A7D08 */
 static void corkscrew_rc_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2203,11 +1695,7 @@ static void corkscrew_rc_track_left_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A7D18 */
 static void corkscrew_rc_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2217,11 +1705,7 @@ static void corkscrew_rc_track_right_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A7D28 */
 static void corkscrew_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2283,8 +1767,7 @@ static void corkscrew_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2315,8 +1798,7 @@ static void corkscrew_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2358,11 +1840,7 @@ static void corkscrew_rc_track_s_bend_left(
 
 /** rct2: 0x008A7D38 */
 static void corkscrew_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2424,8 +1902,7 @@ static void corkscrew_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2456,8 +1933,7 @@ static void corkscrew_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2499,11 +1975,7 @@ static void corkscrew_rc_track_s_bend_right(
 
 /** rct2: 0x008A7D48 */
 static void corkscrew_rc_track_left_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2544,8 +2016,7 @@ static void corkscrew_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 56, 0x20);
             break;
         case 1:
@@ -2580,8 +2051,7 @@ static void corkscrew_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 2:
@@ -2589,62 +2059,22 @@ static void corkscrew_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16564,
-                        16,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16564, 16, 0, 3, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16572,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16572, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16567,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16567, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16575,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16575, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
             }
@@ -2676,8 +2106,7 @@ static void corkscrew_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 4:
@@ -2710,8 +2139,7 @@ static void corkscrew_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 7:
@@ -2719,62 +2147,22 @@ static void corkscrew_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16567,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16567, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16575,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16575, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16564,
-                        16,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16564, 16, 0, 3, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16572,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16572, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
             }
@@ -2814,8 +2202,7 @@ static void corkscrew_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 9:
@@ -2859,8 +2246,7 @@ static void corkscrew_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 56, 0x20);
             break;
     }
@@ -2868,11 +2254,7 @@ static void corkscrew_rc_track_left_vertical_loop(
 
 /** rct2: 0x008A7D58 */
 static void corkscrew_rc_track_right_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2939,62 +2321,22 @@ static void corkscrew_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16591,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16591, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16583,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16583, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16588,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16588, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16580,
-                        16,
-                        0,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16580, 16, 0, 2, 16, 119, height, 16, 0,
                         height);
                     break;
             }
@@ -3055,62 +2397,22 @@ static void corkscrew_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16588,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16588, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16580,
-                        16,
-                        0,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16580, 16, 0, 2, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16591,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16591, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16583,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16583, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
             }
@@ -3185,11 +2487,7 @@ static void corkscrew_rc_track_right_vertical_loop(
 
 /** rct2: 0x008A7D98 */
 static void corkscrew_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3231,17 +2529,7 @@ static void corkscrew_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16380,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16380, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -3250,32 +2538,12 @@ static void corkscrew_rc_track_left_quarter_turn_3(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16386,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16386, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16377,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16377, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -3322,11 +2590,7 @@ static void corkscrew_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x008A7DA8 */
 static void corkscrew_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3335,11 +2599,7 @@ static void corkscrew_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x008A7DB8 */
 static void corkscrew_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3351,32 +2611,12 @@ static void corkscrew_rc_track_left_quarter_turn_3_bank(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16393, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16400,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16400, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16396,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16396, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -3405,62 +2645,22 @@ static void corkscrew_rc_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16392,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16392, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16395,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16395, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16398,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16398, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16389,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16389, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -3477,34 +2677,14 @@ static void corkscrew_rc_track_left_quarter_turn_3_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16394,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16394, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16397, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16401,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16401, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -3531,11 +2711,7 @@ static void corkscrew_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x008A7DC8 */
 static void corkscrew_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3544,11 +2720,7 @@ static void corkscrew_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x008A7DD8 */
 static void corkscrew_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3627,11 +2799,7 @@ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A7DE8 */
 static void corkscrew_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3717,11 +2885,7 @@ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A7DF8 */
 static void corkscrew_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3731,11 +2895,7 @@ static void corkscrew_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A7E08 */
 static void corkscrew_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3745,11 +2905,7 @@ static void corkscrew_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A7E18 */
 static void corkscrew_rc_track_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3794,34 +2950,14 @@ static void corkscrew_rc_track_half_loop_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16603,
-                        0,
-                        14,
-                        3,
-                        20,
-                        63,
-                        height,
-                        28,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16603, 0, 14, 3, 20, 63, height, 28, 6,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16600,
-                        0,
-                        6,
-                        3,
-                        20,
-                        63,
-                        height,
-                        28,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16600, 0, 6, 3, 20, 63, height, 28, 6,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3845,17 +2981,7 @@ static void corkscrew_rc_track_half_loop_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16604,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16604, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 2:
@@ -3864,17 +2990,7 @@ static void corkscrew_rc_track_half_loop_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16607,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        15,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16607, 16, 16, 2, 16, 119, height, 15, 6,
                         height);
                     break;
             }
@@ -3882,8 +2998,7 @@ static void corkscrew_rc_track_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 168, 0x20);
             break;
         case 3:
@@ -3919,11 +3034,7 @@ static void corkscrew_rc_track_half_loop_up(
 
 /** rct2: 0x008A7E28 */
 static void corkscrew_rc_track_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, tileElement);
@@ -3931,11 +3042,7 @@ static void corkscrew_rc_track_half_loop_down(
 
 /** rct2: 0x008A7E38 */
 static void corkscrew_rc_track_left_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3945,62 +3052,22 @@ static void corkscrew_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16610,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16610, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16613,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16613, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16616,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16616, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16619,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16619, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
             }
@@ -4018,62 +3085,22 @@ static void corkscrew_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16611,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16611, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16614,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16614, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16617,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16617, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16620,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16620, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
             }
@@ -4085,71 +3112,29 @@ static void corkscrew_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16612,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16612, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16615,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16615, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16618,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16618, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16621,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16621, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 35, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -4169,11 +3154,7 @@ static void corkscrew_rc_track_left_corkscrew_up(
 
 /** rct2: 0x008A7E48 */
 static void corkscrew_rc_track_right_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4183,62 +3164,22 @@ static void corkscrew_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16622,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16622, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16625,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16625, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16628,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16628, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16631,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16631, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
             }
@@ -4248,10 +3189,8 @@ static void corkscrew_rc_track_right_corkscrew_up(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 1:
@@ -4259,62 +3198,22 @@ static void corkscrew_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16623,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16623, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16626,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16626, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16629,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16629, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16632,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16632, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
             }
@@ -4326,71 +3225,29 @@ static void corkscrew_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16624,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16624, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16627,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16627, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16630,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16630, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16633,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16633, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 35, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -4410,11 +3267,7 @@ static void corkscrew_rc_track_right_corkscrew_up(
 
 /** rct2: 0x008A7E58 */
 static void corkscrew_rc_track_left_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_right_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, tileElement);
@@ -4422,11 +3275,7 @@ static void corkscrew_rc_track_left_corkscrew_down(
 
 /** rct2: 0x008A7E68 */
 static void corkscrew_rc_track_right_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_left_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, tileElement);
@@ -4434,11 +3283,7 @@ static void corkscrew_rc_track_right_corkscrew_down(
 
 /** rct2: 0x008A7E78 */
 static void corkscrew_rc_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4450,32 +3295,12 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16481, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16488,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16488, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16484,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16484, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -4493,10 +3318,8 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -4507,62 +3330,22 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16480,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16480, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16483,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16483, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16486,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16486, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16477,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16477, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -4579,34 +3362,14 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16482,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16482, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16485, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16489,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16489, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4625,10 +3388,8 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -4642,32 +3403,12 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16481, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16488,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16488, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16484,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16484, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4686,10 +3427,8 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -4700,62 +3439,22 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16477,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16477, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16480,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16480, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16483,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16483, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16486,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16486, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4776,34 +3475,14 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16482,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16482, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16485, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16489,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16489, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -4813,10 +3492,8 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -4824,11 +3501,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_small(
 
 /** rct2: 0x008A7E88 */
 static void corkscrew_rc_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4846,34 +3519,14 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16468,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16468, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16471, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16475,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16475, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -4883,10 +3536,8 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -4897,62 +3548,22 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16463,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16463, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16466,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16466, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16469,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16469, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16472,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16472, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4971,32 +3582,12 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16467, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16474,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16474, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16470,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16470, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -5015,10 +3606,8 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -5030,34 +3619,14 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16468,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16468, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16471, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16475,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16475, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -5076,10 +3645,8 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -5090,62 +3657,22 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16466,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16466, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16469,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16469, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16472,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16472, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16463,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16463, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -5160,32 +3687,12 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16467, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16474,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16474, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16470,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16470, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -5203,10 +3710,8 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -5214,11 +3719,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_small(
 
 /** rct2: 0x008A7E98 */
 static void corkscrew_rc_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -5233,11 +3734,7 @@ static void corkscrew_rc_track_left_half_banked_helix_down_small(
 
 /** rct2: 0x008A7EA8 */
 static void corkscrew_rc_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -5252,11 +3749,7 @@ static void corkscrew_rc_track_right_half_banked_helix_down_small(
 
 /** rct2: 0x008A7EB8 */
 static void corkscrew_rc_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5268,32 +3761,12 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16449, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16460,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16460, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16454,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16454, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -5311,10 +3784,8 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -5329,47 +3800,17 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16453,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16453, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16458,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16458, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16443,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16443, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5377,8 +3818,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -5386,47 +3826,17 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16447,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16447, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16452,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16452, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16457,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16457, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -5446,32 +3856,12 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16446,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16446, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16451,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16451, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -5480,17 +3870,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16441,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16441, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -5498,8 +3878,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -5511,34 +3890,14 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16450,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16450, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16455, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16461,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16461, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -5557,10 +3916,8 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -5574,32 +3931,12 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16449, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16460,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16460, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16454,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16454, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -5618,10 +3955,8 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -5632,17 +3967,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16443,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16443, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -5651,32 +3976,12 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16453,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16453, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16458,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16458, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -5684,8 +3989,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -5697,47 +4001,17 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16447,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16447, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16452,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16452, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16457,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16457, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5753,47 +4027,17 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16441,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16441, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16446,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16446, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16451,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16451, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -5805,8 +4049,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -5822,34 +4065,14 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16450,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16450, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16455, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16461,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16461, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -5859,10 +4082,8 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -5870,11 +4091,7 @@ static void corkscrew_rc_track_left_half_banked_helix_up_large(
 
 /** rct2: 0x008A7EC8 */
 static void corkscrew_rc_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5892,34 +4109,14 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16428,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16428, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16433, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16439,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16439, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -5929,10 +4126,8 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -5943,47 +4138,17 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16419,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16419, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16424,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16424, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16429,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16429, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -5995,8 +4160,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -6008,47 +4172,17 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16425,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16425, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16430,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16430, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16435,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16435, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -6064,17 +4198,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16421,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16421, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -6083,32 +4207,12 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16431,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16431, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16436,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16436, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -6116,8 +4220,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -6131,32 +4234,12 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16427, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16438,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16438, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16432,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16432, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -6175,10 +4258,8 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -6190,34 +4271,14 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16428,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16428, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16433, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16439,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16439, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -6236,10 +4297,8 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -6250,32 +4309,12 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16424,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16424, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16429,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16429, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -6284,17 +4323,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16419,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16419, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -6302,8 +4331,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -6311,47 +4339,17 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16425,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16425, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16430,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16430, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16435,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16435, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -6375,47 +4373,17 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16431,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16431, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16436,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16436, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16421,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16421, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -6423,8 +4391,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -6434,32 +4401,12 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16427, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16438,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16438, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16432,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16432, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -6477,10 +4424,8 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -6488,11 +4433,7 @@ static void corkscrew_rc_track_right_half_banked_helix_up_large(
 
 /** rct2: 0x008A7ED8 */
 static void corkscrew_rc_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -6507,11 +4448,7 @@ static void corkscrew_rc_track_left_half_banked_helix_down_large(
 
 /** rct2: 0x008A7EE8 */
 static void corkscrew_rc_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -6526,11 +4463,7 @@ static void corkscrew_rc_track_right_half_banked_helix_down_large(
 
 /** rct2: 0x008A7F18 */
 static void corkscrew_rc_track_left_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -6567,11 +4500,7 @@ static void corkscrew_rc_track_left_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008A7EF8 */
 static void corkscrew_rc_track_right_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -6608,11 +4537,7 @@ static void corkscrew_rc_track_right_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008A7F08 */
 static void corkscrew_rc_track_left_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_right_quarter_turn_1_60_deg_up(
@@ -6621,11 +4546,7 @@ static void corkscrew_rc_track_left_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008A7F28 */
 static void corkscrew_rc_track_right_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_left_quarter_turn_1_60_deg_up(
@@ -6634,11 +4555,7 @@ static void corkscrew_rc_track_right_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008A7F38 */
 static void corkscrew_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -6666,11 +4583,7 @@ static void corkscrew_rc_track_brakes(
 
 /** rct2: 0x008A7F48 */
 static void corkscrew_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -6712,11 +4625,7 @@ static void corkscrew_rc_track_on_ride_photo(
 
 /** rct2: 0x008A8198 */
 static void corkscrew_rc_track_flat_to_60_deg_up_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6821,32 +4730,12 @@ static void corkscrew_rc_track_flat_to_60_deg_up_long_base(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16795,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16795, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16799,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16799, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -6877,11 +4766,7 @@ static void corkscrew_rc_track_flat_to_60_deg_up_long_base(
 
 /** rct2: 0x008A81A8 */
 static void corkscrew_rc_track_60_deg_up_to_flat_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6895,32 +4780,12 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16808,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16808, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16812,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16812, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -7042,11 +4907,7 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base(
 
 /** rct2: 0x008A81B8 */
 static void corkscrew_rc_track_flat_to_60_deg_down_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_flat_to_60_deg_up_long_base(
@@ -7055,11 +4916,7 @@ static void corkscrew_rc_track_flat_to_60_deg_down_long_base(
 
 /** rct2: 0x008A81C8 */
 static void corkscrew_rc_track_60_deg_up_to_flat_long_base122(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     corkscrew_rc_track_60_deg_up_to_flat_long_base(
@@ -7068,11 +4925,7 @@ static void corkscrew_rc_track_60_deg_up_to_flat_long_base122(
 
 /** rct2: 0x008A7F68 */
 static void corkscrew_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7119,32 +4972,12 @@ static void corkscrew_rc_track_left_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16749,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16749, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16753,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16753, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -7152,8 +4985,7 @@ static void corkscrew_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -7161,47 +4993,17 @@ static void corkscrew_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16742,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16742, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16746,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16746, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16750,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16750, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -7210,10 +5012,8 @@ static void corkscrew_rc_track_left_eighth_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -7226,34 +5026,14 @@ static void corkscrew_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16743,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16743, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16747,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16747, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7266,17 +5046,7 @@ static void corkscrew_rc_track_left_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16755,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16755, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7286,8 +5056,7 @@ static void corkscrew_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -7295,11 +5064,7 @@ static void corkscrew_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x008A7F78 */
 static void corkscrew_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7338,32 +5103,12 @@ static void corkscrew_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16725,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16725, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16729,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16729, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -7379,8 +5124,7 @@ static void corkscrew_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -7392,17 +5136,7 @@ static void corkscrew_rc_track_right_eighth_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16730,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16730, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
@@ -7411,25 +5145,13 @@ static void corkscrew_rc_track_right_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16738,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16738, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -7442,17 +5164,7 @@ static void corkscrew_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16727,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16727, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7465,34 +5177,14 @@ static void corkscrew_rc_track_right_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16735,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16735, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16739,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16739, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7502,8 +5194,7 @@ static void corkscrew_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -7511,11 +5202,7 @@ static void corkscrew_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x008A7F88 */
 static void corkscrew_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -7524,11 +5211,7 @@ static void corkscrew_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008A7F98 */
 static void corkscrew_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -7537,11 +5220,7 @@ static void corkscrew_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008A7FA8 */
 static void corkscrew_rc_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7551,32 +5230,12 @@ static void corkscrew_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16772,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16772, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16776,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16776, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -7606,47 +5265,17 @@ static void corkscrew_rc_track_left_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16777,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16777, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16781,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16781, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16785,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16785, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -7654,8 +5283,7 @@ static void corkscrew_rc_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -7663,47 +5291,17 @@ static void corkscrew_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16774,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16774, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16778,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16778, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16782,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16782, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -7712,10 +5310,8 @@ static void corkscrew_rc_track_left_eighth_bank_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -7728,34 +5324,14 @@ static void corkscrew_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16775,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16775, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16779,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16779, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7768,17 +5344,7 @@ static void corkscrew_rc_track_left_eighth_bank_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16787,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16787, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7788,8 +5354,7 @@ static void corkscrew_rc_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -7797,11 +5362,7 @@ static void corkscrew_rc_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x008A7FB8 */
 static void corkscrew_rc_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7819,32 +5380,12 @@ static void corkscrew_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16764,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16764, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16768,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16768, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -7866,32 +5407,12 @@ static void corkscrew_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16761,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16761, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16765,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16765, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -7903,8 +5424,7 @@ static void corkscrew_rc_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -7916,55 +5436,23 @@ static void corkscrew_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16762,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16762, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16766,
-                        0,
-                        0,
-                        28,
-                        28,
-                        0,
-                        height,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16766, 0, 0, 28, 28, 0, height, 4, 4,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16770,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16770, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -7977,17 +5465,7 @@ static void corkscrew_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16759,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16759, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8000,34 +5478,14 @@ static void corkscrew_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16767,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16767, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16771,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16771, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8037,8 +5495,7 @@ static void corkscrew_rc_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -8046,11 +5503,7 @@ static void corkscrew_rc_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x008A7FC8 */
 static void corkscrew_rc_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -8059,11 +5512,7 @@ static void corkscrew_rc_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008A7FD8 */
 static void corkscrew_rc_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -8072,11 +5521,7 @@ static void corkscrew_rc_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008A7F58 */
 static void corkscrew_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8088,18 +5533,8 @@ static void corkscrew_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16699,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16699, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8109,18 +5544,8 @@ static void corkscrew_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16637,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16637, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8135,18 +5560,8 @@ static void corkscrew_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16696,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16696, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8156,18 +5571,8 @@ static void corkscrew_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16634,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16634, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8182,18 +5587,8 @@ static void corkscrew_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16698,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16698, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8203,18 +5598,8 @@ static void corkscrew_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16636,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16636, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8233,18 +5618,8 @@ static void corkscrew_rc_track_diag_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16697,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16697, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8268,18 +5643,8 @@ static void corkscrew_rc_track_diag_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16635,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16635, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8302,11 +5667,7 @@ static void corkscrew_rc_track_diag_flat(
 
 /** rct2: 0x008A8008 */
 static void corkscrew_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8318,18 +5679,8 @@ static void corkscrew_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16711,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16711, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8339,18 +5690,8 @@ static void corkscrew_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16649,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16649, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8365,18 +5706,8 @@ static void corkscrew_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16708,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16708, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8386,18 +5717,8 @@ static void corkscrew_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16646,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16646, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8412,18 +5733,8 @@ static void corkscrew_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16710,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16710, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8433,18 +5744,8 @@ static void corkscrew_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16648,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16648, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8463,18 +5764,8 @@ static void corkscrew_rc_track_diag_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16709,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16709, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8498,18 +5789,8 @@ static void corkscrew_rc_track_diag_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16647,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16647, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8532,11 +5813,7 @@ static void corkscrew_rc_track_diag_25_deg_up(
 
 /** rct2: 0x008A8068 */
 static void corkscrew_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8548,18 +5825,8 @@ static void corkscrew_rc_track_diag_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16723,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16723, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8569,18 +5836,8 @@ static void corkscrew_rc_track_diag_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16661,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16661, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8595,18 +5852,8 @@ static void corkscrew_rc_track_diag_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16720,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16720, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8616,18 +5863,8 @@ static void corkscrew_rc_track_diag_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16658,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16658, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8642,18 +5879,8 @@ static void corkscrew_rc_track_diag_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16722,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16722, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8663,18 +5890,8 @@ static void corkscrew_rc_track_diag_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16660,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16660, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8693,18 +5910,8 @@ static void corkscrew_rc_track_diag_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16721,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16721, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 36, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8728,18 +5935,8 @@ static void corkscrew_rc_track_diag_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16659,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16659, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 36, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8762,11 +5959,7 @@ static void corkscrew_rc_track_diag_60_deg_up(
 
 /** rct2: 0x008A7FE8 */
 static void corkscrew_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8778,18 +5971,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16703,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16703, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8799,18 +5982,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16641,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16641, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8825,18 +5998,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16700,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16700, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8846,18 +6009,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16638,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16638, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8872,18 +6025,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16702,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16702, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8893,18 +6036,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16640,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16640, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8923,18 +6056,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16701,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16701, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8958,18 +6081,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16639,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16639, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8992,11 +6105,7 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008A8048 */
 static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9008,18 +6117,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16715,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16715, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9029,18 +6128,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16653,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16653, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9055,18 +6144,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16712,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16712, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9076,18 +6155,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16650,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16650, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9102,18 +6171,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16714,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16714, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9123,18 +6182,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16652,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16652, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9153,18 +6202,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16713,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16713, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9188,18 +6227,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16651,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16651, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9222,11 +6251,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008A8058 */
 static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9238,18 +6263,8 @@ static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16719,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16719, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9259,18 +6274,8 @@ static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16657,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16657, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9285,18 +6290,8 @@ static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16716,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16716, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9306,18 +6301,8 @@ static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16654,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16654, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9332,18 +6317,8 @@ static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16718,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16718, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9353,18 +6328,8 @@ static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16656,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16656, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9383,17 +6348,7 @@ static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16717,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16717, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 21, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -9418,17 +6373,7 @@ static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16655,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16655, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 21, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -9452,11 +6397,7 @@ static void corkscrew_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A7FF8 */
 static void corkscrew_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9468,18 +6409,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16707,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16707, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9489,18 +6420,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16645,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16645, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9515,18 +6436,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16704,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16704, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9536,18 +6447,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16642,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16642, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9562,18 +6463,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16706,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16706, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9583,18 +6474,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16644,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16644, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9613,18 +6494,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16705,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16705, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9648,18 +6519,8 @@ static void corkscrew_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16643,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16643, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9682,11 +6543,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008A8038 */
 static void corkscrew_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9698,18 +6555,8 @@ static void corkscrew_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16709,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16709, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9719,18 +6566,8 @@ static void corkscrew_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16647,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16647, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9745,18 +6582,8 @@ static void corkscrew_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16710,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16710, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9766,18 +6593,8 @@ static void corkscrew_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16648,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16648, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9792,18 +6609,8 @@ static void corkscrew_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16708,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16708, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9813,18 +6620,8 @@ static void corkscrew_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16646,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16646, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9843,18 +6640,8 @@ static void corkscrew_rc_track_diag_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16711,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16711, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9878,18 +6665,8 @@ static void corkscrew_rc_track_diag_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16649,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16649, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9912,11 +6689,7 @@ static void corkscrew_rc_track_diag_25_deg_down(
 
 /** rct2: 0x008A8098 */
 static void corkscrew_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9928,18 +6701,8 @@ static void corkscrew_rc_track_diag_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16721,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16721, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9949,18 +6712,8 @@ static void corkscrew_rc_track_diag_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16659,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16659, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9975,18 +6728,8 @@ static void corkscrew_rc_track_diag_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16722,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16722, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9996,18 +6739,8 @@ static void corkscrew_rc_track_diag_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16660,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16660, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10022,18 +6755,8 @@ static void corkscrew_rc_track_diag_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16720,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16720, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10043,18 +6766,8 @@ static void corkscrew_rc_track_diag_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16658,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16658, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10073,18 +6786,8 @@ static void corkscrew_rc_track_diag_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16723,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16723, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 28, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10108,18 +6811,8 @@ static void corkscrew_rc_track_diag_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16661,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16661, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 28, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10142,11 +6835,7 @@ static void corkscrew_rc_track_diag_60_deg_down(
 
 /** rct2: 0x008A8018 */
 static void corkscrew_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10158,18 +6847,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16705,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16705, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10179,18 +6858,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16643,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16643, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10204,18 +6873,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16706,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16706, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10225,18 +6884,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16644,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16644, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10250,18 +6899,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16704,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16704, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10271,18 +6910,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16642,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16642, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10300,18 +6929,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16707,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16707, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10335,18 +6954,8 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16645,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16645, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10370,11 +6979,7 @@ static void corkscrew_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008A8078 */
 static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10386,17 +6991,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16717,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16717, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
@@ -10407,17 +7002,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16655,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16655, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
@@ -10433,18 +7018,8 @@ static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16718,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16718, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10454,18 +7029,8 @@ static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16656,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16656, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10480,18 +7045,8 @@ static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16716,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16716, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10501,18 +7056,8 @@ static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16654,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16654, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10531,18 +7076,8 @@ static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16719,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16719, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 17, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10566,18 +7101,8 @@ static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16657,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16657, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 17, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10600,11 +7125,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008A8088 */
 static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10616,18 +7137,8 @@ static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16713,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16713, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10637,18 +7148,8 @@ static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16651,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16651, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10663,18 +7164,8 @@ static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16714,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16714, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10684,18 +7175,8 @@ static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16652,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16652, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10710,18 +7191,8 @@ static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16712,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16712, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10731,18 +7202,8 @@ static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16650,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16650, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10761,18 +7222,8 @@ static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16715,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16715, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10796,18 +7247,8 @@ static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16653,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16653, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10830,11 +7271,7 @@ static void corkscrew_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A8028 */
 static void corkscrew_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10846,18 +7283,8 @@ static void corkscrew_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16701,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16701, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10867,18 +7294,8 @@ static void corkscrew_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16639,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16639, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10893,18 +7310,8 @@ static void corkscrew_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16702,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16702, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10914,18 +7321,8 @@ static void corkscrew_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16640,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16640, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10940,18 +7337,8 @@ static void corkscrew_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16700,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16700, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10961,18 +7348,8 @@ static void corkscrew_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16638,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16638, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10991,18 +7368,8 @@ static void corkscrew_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16703,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16703, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -11026,18 +7393,8 @@ static void corkscrew_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16641,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16641, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -11060,11 +7417,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x008A80C8 */
 static void corkscrew_rc_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11074,17 +7427,7 @@ static void corkscrew_rc_track_diag_flat_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16669,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16669, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11097,30 +7440,10 @@ static void corkscrew_rc_track_diag_flat_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16666,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16666, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16670,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16670, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -11133,17 +7456,7 @@ static void corkscrew_rc_track_diag_flat_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16668,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16668, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11160,17 +7473,7 @@ static void corkscrew_rc_track_diag_flat_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16667,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16667, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11193,11 +7496,7 @@ static void corkscrew_rc_track_diag_flat_to_left_bank(
 
 /** rct2: 0x008A80D8 */
 static void corkscrew_rc_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11207,17 +7506,7 @@ static void corkscrew_rc_track_diag_flat_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16674,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16674, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11230,17 +7519,7 @@ static void corkscrew_rc_track_diag_flat_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16671,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16671, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11253,30 +7532,10 @@ static void corkscrew_rc_track_diag_flat_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16673,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16673, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16675,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16675, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -11293,17 +7552,7 @@ static void corkscrew_rc_track_diag_flat_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16672,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16672, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11326,11 +7575,7 @@ static void corkscrew_rc_track_diag_flat_to_right_bank(
 
 /** rct2: 0x008A80E8 */
 static void corkscrew_rc_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11340,17 +7585,7 @@ static void corkscrew_rc_track_diag_left_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16672,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16672, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11363,30 +7598,10 @@ static void corkscrew_rc_track_diag_left_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16673,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16673, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16675,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16675, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -11399,17 +7614,7 @@ static void corkscrew_rc_track_diag_left_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16671,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16671, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11426,17 +7631,7 @@ static void corkscrew_rc_track_diag_left_bank_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16674,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16674, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11459,11 +7654,7 @@ static void corkscrew_rc_track_diag_left_bank_to_flat(
 
 /** rct2: 0x008A80F8 */
 static void corkscrew_rc_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11473,17 +7664,7 @@ static void corkscrew_rc_track_diag_right_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16667,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16667, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11496,17 +7677,7 @@ static void corkscrew_rc_track_diag_right_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16668,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16668, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11519,30 +7690,10 @@ static void corkscrew_rc_track_diag_right_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16666,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16666, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16670,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16670, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -11559,17 +7710,7 @@ static void corkscrew_rc_track_diag_right_bank_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16669,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16669, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11592,11 +7733,7 @@ static void corkscrew_rc_track_diag_right_bank_to_flat(
 
 /** rct2: 0x008A8128 */
 static void corkscrew_rc_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11606,17 +7743,7 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16689,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16689, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11629,30 +7756,10 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16686,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16686, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16690,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16690, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11665,17 +7772,7 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16688,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16688, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11692,17 +7789,7 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16687,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16687, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11725,11 +7812,7 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x008A8138 */
 static void corkscrew_rc_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11739,17 +7822,7 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16694,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16694, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11762,17 +7835,7 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16691,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16691, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11785,30 +7848,10 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16693,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16693, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16695,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16695, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11825,17 +7868,7 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16692,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16692, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11858,11 +7891,7 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x008A8108 */
 static void corkscrew_rc_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11872,17 +7901,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16679,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16679, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11895,30 +7914,10 @@ static void corkscrew_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16676,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16676, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16680,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16680, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11931,17 +7930,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16678,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16678, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11958,17 +7947,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16677,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16677, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11991,11 +7970,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x008A8118 */
 static void corkscrew_rc_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12005,17 +7980,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16684,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16684, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12028,17 +7993,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16681,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16681, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12051,30 +8006,10 @@ static void corkscrew_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16683,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16683, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16685,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16685, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -12091,17 +8026,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16682,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16682, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12124,11 +8049,7 @@ static void corkscrew_rc_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x008A8148 */
 static void corkscrew_rc_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12138,17 +8059,7 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16682,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16682, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12160,30 +8071,10 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16683,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16683, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16685,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16685, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -12195,17 +8086,7 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16681,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16681, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12221,17 +8102,7 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16684,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16684, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12255,11 +8126,7 @@ static void corkscrew_rc_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x008A8158 */
 static void corkscrew_rc_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12269,17 +8136,7 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16677,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16677, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12291,17 +8148,7 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16678,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16678, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12313,30 +8160,10 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16676,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16676, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16680,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16680, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -12352,17 +8179,7 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16679,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16679, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12386,11 +8203,7 @@ static void corkscrew_rc_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x008A8168 */
 static void corkscrew_rc_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12400,17 +8213,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16692,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16692, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12423,30 +8226,10 @@ static void corkscrew_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16693,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16693, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16695,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16695, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -12459,17 +8242,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16691,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16691, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12486,17 +8259,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16694,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16694, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12519,11 +8282,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x008A8178 */
 static void corkscrew_rc_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12533,17 +8292,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16687,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16687, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12556,17 +8305,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16688,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16688, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12579,30 +8318,10 @@ static void corkscrew_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16686,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16686, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16690,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16690, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -12619,17 +8338,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16689,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16689, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12652,11 +8361,7 @@ static void corkscrew_rc_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x008A80A8 */
 static void corkscrew_rc_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12666,17 +8371,7 @@ static void corkscrew_rc_track_diag_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16665,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16665, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12689,17 +8384,7 @@ static void corkscrew_rc_track_diag_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16662,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16662, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -12712,17 +8397,7 @@ static void corkscrew_rc_track_diag_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16664,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16664, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12739,17 +8414,7 @@ static void corkscrew_rc_track_diag_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16663,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16663, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12772,11 +8437,7 @@ static void corkscrew_rc_track_diag_left_bank(
 
 /** rct2: 0x008A80B8 */
 static void corkscrew_rc_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12786,17 +8447,7 @@ static void corkscrew_rc_track_diag_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16663,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16663, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12809,17 +8460,7 @@ static void corkscrew_rc_track_diag_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16664,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16664, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12832,17 +8473,7 @@ static void corkscrew_rc_track_diag_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16662,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16662, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -12859,17 +8490,7 @@ static void corkscrew_rc_track_diag_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16665,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16665, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12892,11 +8513,7 @@ static void corkscrew_rc_track_diag_right_bank(
 
 /** rct2: 0x008A8188 */
 static void corkscrew_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12920,11 +8537,7 @@ static void corkscrew_rc_track_block_brakes(
 }
 
 static void corkscrew_rc_track_booster(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!is_csg_loaded())
@@ -12943,59 +8556,19 @@ static void corkscrew_rc_track_booster(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | sprite_ne_sw_behind,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | sprite_ne_sw_behind, 0, 0, 32, 20, 3, height, 0, 6,
                 height);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | sprite_ne_sw_after,
-                0,
-                0,
-                32,
-                1,
-                26,
-                height,
-                0,
-                27,
+                session, direction, session->TrackColours[SCHEME_TRACK] | sprite_ne_sw_after, 0, 0, 32, 1, 26, height, 0, 27,
                 height);
             break;
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | sprite_nw_se_behind,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | sprite_nw_se_behind, 0, 0, 32, 20, 3, height, 0, 6,
                 height);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | sprite_nw_se_after,
-                0,
-                0,
-                32,
-                1,
-                26,
-                height,
-                0,
-                27,
+                session, direction, session->TrackColours[SCHEME_TRACK] | sprite_nw_se_after, 0, 0, 32, 1, 26, height, 0, 27,
                 height);
             break;
     }
diff --git a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp
index d3b95b6645..07f356d766 100644
--- a/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/FlyingRollerCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x007C6FF4 */
 static void flying_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -92,33 +88,13 @@ static void flying_rc_track_flat(
                 case 0:
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27131,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27131, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 22);
                     break;
                 case 1:
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27132,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27132, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 22);
                     break;
             }
@@ -130,33 +106,13 @@ static void flying_rc_track_flat(
                 case 0:
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27129,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27129, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 22);
                     break;
                 case 1:
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27130,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27130, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 22);
                     break;
             }
@@ -177,11 +133,7 @@ static void flying_rc_track_flat(
 
 /** rct2: 0x007C7244, 0x007C7254, 0x007C7264 */
 static void flying_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_inverted(tileElement))
@@ -193,44 +145,14 @@ static void flying_rc_track_station(
             { SPR_STATION_BASE_C_NW_SE, 27132, SPR_STATION_INVERTED_BAR_C_NW_SE },
         };
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][0] | session->TrackColours[SCHEME_MISC],
-            0,
-            0,
-            32,
-            28,
-            1,
-            height,
-            0,
-            2,
+            session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height, 0, 2,
             height);
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            3,
-            height + 24,
-            0,
-            6,
-            height + 24);
+            session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 3, height + 24, 0,
+            6, height + 24);
         sub_98199C_rotated(
-            session,
-            direction,
-            imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS],
-            0,
-            6,
-            32,
-            20,
-            1,
-            height + 24,
-            0,
-            6,
-            height + 24);
+            session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 1, height + 24,
+            0, 6, height + 24);
         track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 11);
         track_paint_util_draw_station_inverted(session, rideIndex, direction, height, tileElement, STATION_VARIANT_1);
     }
@@ -246,33 +168,13 @@ static void flying_rc_track_station(
         if (track_element_get_type(tileElement) == TRACK_ELEM_END_STATION)
         {
             sub_98197C_rotated(
-                session,
-                direction,
-                imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-                0,
-                0,
-                32,
-                20,
-                1,
-                height,
-                0,
-                6,
+                session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
                 height + 3);
         }
         else
         {
             sub_98197C_rotated(
-                session,
-                direction,
-                imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-                0,
-                0,
-                32,
-                20,
-                1,
-                height,
-                0,
-                6,
+                session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
                 height + 3);
         }
         sub_98196C_rotated(
@@ -288,11 +190,7 @@ static void flying_rc_track_station(
 
 /** rct2: 0x007C7004 */
 static void flying_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -341,62 +239,22 @@ static void flying_rc_track_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27249,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27249, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27250,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27250, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27251,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27251, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27252,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27252, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
             }
@@ -407,62 +265,22 @@ static void flying_rc_track_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27221,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27221, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27222,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27222, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27223,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27223, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27224,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27224, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
             }
@@ -507,11 +325,7 @@ static void flying_rc_track_25_deg_up(
 
 /** rct2: 0x007C7014 */
 static void flying_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -558,62 +372,22 @@ static void flying_rc_track_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27237,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27237, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 88);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27238,
-                    0,
-                    0,
-                    32,
-                    2,
-                    81,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27238, 0, 0, 32, 2, 81, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27239,
-                    0,
-                    0,
-                    32,
-                    2,
-                    81,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27239, 0, 0, 32, 2, 81, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27240,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27240, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 88);
                 break;
         }
@@ -633,11 +407,7 @@ static void flying_rc_track_60_deg_up(
 
 /** rct2: 0x007C7024 */
 static void flying_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -686,62 +456,22 @@ static void flying_rc_track_flat_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27241,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27241, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27242,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27242, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27243,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27243, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27244,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27244, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
             }
@@ -752,62 +482,22 @@ static void flying_rc_track_flat_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27213,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27213, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27214,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27214, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27215,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27215, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27216,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27216, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
             }
@@ -852,11 +542,7 @@ static void flying_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x007C7034 */
 static void flying_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -907,88 +593,28 @@ static void flying_rc_track_25_deg_up_to_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27225,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27225, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27229,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27229, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27226,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27226, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27230,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27230, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27227,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27227, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27228,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27228, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
         }
@@ -1008,11 +634,7 @@ static void flying_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x007C7044 */
 static void flying_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -1063,88 +685,28 @@ static void flying_rc_track_60_deg_up_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27231,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27231, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27235,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27235, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27232,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27232, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27236,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27236, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27233,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27233, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27234,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27234, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
         }
@@ -1188,11 +750,7 @@ static void flying_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x007C7054 */
 static void flying_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -1241,62 +799,22 @@ static void flying_rc_track_25_deg_up_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27245,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27245, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27246,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27246, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27247,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27247, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27248,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27248, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
             }
@@ -1307,62 +825,22 @@ static void flying_rc_track_25_deg_up_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27217,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27217, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27218,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27218, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27219,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27219, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27220,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27220, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
             }
@@ -1407,11 +885,7 @@ static void flying_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x007C7064 */
 static void flying_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1419,11 +893,7 @@ static void flying_rc_track_25_deg_down(
 
 /** rct2: 0x007C7074 */
 static void flying_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1431,11 +901,7 @@ static void flying_rc_track_60_deg_down(
 
 /** rct2: 0x007C7084 */
 static void flying_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1443,11 +909,7 @@ static void flying_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x007C7094 */
 static void flying_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1455,11 +917,7 @@ static void flying_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x007C70A4 */
 static void flying_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1467,11 +925,7 @@ static void flying_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x007C70B4 */
 static void flying_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1479,11 +933,7 @@ static void flying_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x007C70C4 */
 static void flying_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -1495,62 +945,22 @@ static void flying_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17259,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17259, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17264,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17264, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17269,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17269, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17254,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17254, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -1561,9 +971,7 @@ static void flying_rc_track_left_quarter_turn_5(
                     paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -1575,62 +983,22 @@ static void flying_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17258,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17258, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17263,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17263, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17268,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17268, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17253,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17253, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -1638,8 +1006,7 @@ static void flying_rc_track_left_quarter_turn_5(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -1647,69 +1014,27 @@ static void flying_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17257,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17257, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17262,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17262, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17267,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17267, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17252,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17252, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -1721,62 +1046,22 @@ static void flying_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17256,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17256, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17261,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17261, 0, 0, 16, 32, 3, height, 0, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17266,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17266, 0, 0, 16, 32, 3, height, 0, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17251,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17251, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                 }
@@ -1784,8 +1069,7 @@ static void flying_rc_track_left_quarter_turn_5(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 6:
@@ -1793,62 +1077,22 @@ static void flying_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17255,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17255, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17260,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17260, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17265,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17265, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17250,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17250, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -1864,9 +1108,7 @@ static void flying_rc_track_left_quarter_turn_5(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -1881,62 +1123,22 @@ static void flying_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27142,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27142, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27147,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27147, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27152,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27152, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27137,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27137, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -1944,8 +1146,7 @@ static void flying_rc_track_left_quarter_turn_5(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1963,71 +1164,30 @@ static void flying_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27141,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27141, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27146,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27146, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27151,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27151, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27136,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27136, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -2035,69 +1195,27 @@ static void flying_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27140,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27140, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27145,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27145, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27150,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27150, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27135,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27135, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -2109,71 +1227,30 @@ static void flying_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27139,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27139, 0, 0, 16, 32, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27144,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27144, 0, 0, 16, 32, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27149,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27149, 0, 0, 16, 32, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27134,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27134, 0, 0, 16, 32, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 6:
@@ -2181,62 +1258,22 @@ static void flying_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27138,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27138, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27143,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27143, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27148,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27148, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27133,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27133, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                 }
@@ -2244,8 +1281,7 @@ static void flying_rc_track_left_quarter_turn_5(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2266,11 +1302,7 @@ static void flying_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x007C70D4 */
 static void flying_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2279,11 +1311,7 @@ static void flying_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x007C70E4 */
 static void flying_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -2327,62 +1355,22 @@ static void flying_rc_track_flat_to_left_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27269,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27269, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27270,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27270, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27271,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27271, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27272,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27272, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -2390,8 +1378,7 @@ static void flying_rc_track_flat_to_left_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -2405,11 +1392,7 @@ static void flying_rc_track_flat_to_left_bank(
 
 /** rct2: 0x007C70F4 */
 static void flying_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -2453,62 +1436,22 @@ static void flying_rc_track_flat_to_right_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27273,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27273, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27274,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27274, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27275,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27275, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27276,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27276, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -2516,8 +1459,7 @@ static void flying_rc_track_flat_to_right_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -2531,11 +1473,7 @@ static void flying_rc_track_flat_to_right_bank(
 
 /** rct2: 0x007C7104 */
 static void flying_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -2579,62 +1517,22 @@ static void flying_rc_track_left_bank_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27275,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27275, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27276,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27276, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27273,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27273, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27274,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27274, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -2642,8 +1540,7 @@ static void flying_rc_track_left_bank_to_flat(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -2657,11 +1554,7 @@ static void flying_rc_track_left_bank_to_flat(
 
 /** rct2: 0x007C7114 */
 static void flying_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -2705,62 +1598,22 @@ static void flying_rc_track_right_bank_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27271,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27271, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27272,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27272, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27269,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27269, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27270,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27270, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -2768,8 +1621,7 @@ static void flying_rc_track_right_bank_to_flat(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -2783,11 +1635,7 @@ static void flying_rc_track_right_bank_to_flat(
 
 /** rct2: 0x007C7124 */
 static void flying_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -2799,75 +1647,25 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17279,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17279, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17290,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17290, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17284,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17284, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17289,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17289, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17274,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17274, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -2878,9 +1676,7 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                     paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -2892,62 +1688,22 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17278,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17278, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17283,
-                            0,
-                            0,
-                            32,
-                            16,
-                            1,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17283, 0, 0, 32, 16, 1, height, 0, 0,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17288,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17288, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17273,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17273, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -2955,8 +1711,7 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -2964,69 +1719,27 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17277,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17277, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17282,
-                            0,
-                            0,
-                            16,
-                            16,
-                            1,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17282, 0, 0, 16, 16, 1, height, 16, 16,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17287,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17287, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17272,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17272, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -3038,62 +1751,22 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17276,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17276, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17281,
-                            0,
-                            0,
-                            16,
-                            32,
-                            1,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17281, 0, 0, 16, 32, 1, height, 0, 0,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17286,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17286, 0, 0, 16, 32, 3, height, 0, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17271,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17271, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                 }
@@ -3101,8 +1774,7 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 6:
@@ -3110,75 +1782,25 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17275,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17275, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17280,
-                            0,
-                            0,
-                            1,
-                            32,
-                            26,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17280, 0, 0, 1, 32, 26, height, 27, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17285,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17285, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17291,
-                            0,
-                            0,
-                            1,
-                            32,
-                            26,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17291, 0, 0, 1, 32, 26, height, 27, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17270,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17270, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -3194,9 +1816,7 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -3211,62 +1831,22 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27162,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27162, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27167,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27167, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 24);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27172,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27172, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 24);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27157,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27157, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 24);
                         break;
                 }
@@ -3274,8 +1854,7 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3301,41 +1880,20 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27171,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27171, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 24);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27156,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27156, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 24);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -3343,48 +1901,18 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27160,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27160, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27165,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27165, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 24);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27170,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27170, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 24);
                         break;
                     case 3:
                         sub_98196C_rotated(
@@ -3392,9 +1920,7 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -3406,18 +1932,8 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27159,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27159, 0, 0, 16, 32, 3, height + 24, 16,
+                            0, height + 24);
                         break;
                     case 1:
                         sub_98196C_rotated(
@@ -3429,26 +1945,15 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27154,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27154, 0, 0, 16, 32, 3, height + 24, 16,
+                            0, height + 24);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 6:
@@ -3456,62 +1961,22 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27158,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27158, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27163,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27163, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 24);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27168,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27168, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 24);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27153,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27153, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 24);
                         break;
                 }
@@ -3519,8 +1984,7 @@ static void flying_rc_track_banked_left_quarter_turn_5(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3541,11 +2005,7 @@ static void flying_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x007C7134 */
 static void flying_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -3554,11 +2014,7 @@ static void flying_rc_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x007C7144 */
 static void flying_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -3609,62 +2065,22 @@ static void flying_rc_track_left_bank_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27277,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27277, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27278,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27278, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27279,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27279, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27280,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27280, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -3672,8 +2088,7 @@ static void flying_rc_track_left_bank_to_25_deg_up(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             switch (direction)
@@ -3711,11 +2126,7 @@ static void flying_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x007C7154 */
 static void flying_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -3766,62 +2177,22 @@ static void flying_rc_track_right_bank_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27281,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27281, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27282,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27282, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27283,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27283, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27284,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27284, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -3829,8 +2200,7 @@ static void flying_rc_track_right_bank_to_25_deg_up(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             switch (direction)
@@ -3868,11 +2238,7 @@ static void flying_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x007C7164 */
 static void flying_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -3923,62 +2289,22 @@ static void flying_rc_track_25_deg_up_to_left_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27285,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27285, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27286,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27286, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27287,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27287, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27288,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27288, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -3986,8 +2312,7 @@ static void flying_rc_track_25_deg_up_to_left_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             switch (direction)
@@ -4025,11 +2350,7 @@ static void flying_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x007C7174 */
 static void flying_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -4080,62 +2401,22 @@ static void flying_rc_track_25_deg_up_to_right_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27289,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27289, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27290,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27290, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27291,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27291, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27292,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27292, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -4143,8 +2424,7 @@ static void flying_rc_track_25_deg_up_to_right_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             switch (direction)
@@ -4182,11 +2462,7 @@ static void flying_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x007C7184 */
 static void flying_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -4194,11 +2470,7 @@ static void flying_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x007C7194 */
 static void flying_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -4206,11 +2478,7 @@ static void flying_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x007C71A4 */
 static void flying_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -4218,11 +2486,7 @@ static void flying_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x007C71B4 */
 static void flying_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -4230,11 +2494,7 @@ static void flying_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x007C71C4 */
 static void flying_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -4274,62 +2534,22 @@ static void flying_rc_track_left_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27293,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27293, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27294,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27294, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27295,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27295, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27296,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27296, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -4337,8 +2557,7 @@ static void flying_rc_track_left_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -4352,11 +2571,7 @@ static void flying_rc_track_left_bank(
 
 /** rct2: 0x007C71D4 */
 static void flying_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -4364,11 +2579,7 @@ static void flying_rc_track_right_bank(
 
 /** rct2: 0x007C71E4 */
 static void flying_rc_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -4380,62 +2591,22 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17344,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17344, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17349,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17349, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17354,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17354, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17359,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17359, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -4446,9 +2617,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                     paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -4468,32 +2637,12 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17355,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17355, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17360,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17360, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -4501,8 +2650,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 3:
@@ -4510,47 +2658,17 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17346,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17346, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17351,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17351, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17356,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17356, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
@@ -4559,9 +2677,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 64, 0x20);
                 break;
@@ -4573,17 +2689,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17347,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17347, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
@@ -4596,17 +2702,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17362,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17362, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                 }
@@ -4614,8 +2710,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 6:
@@ -4623,62 +2718,22 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17348,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17348, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17353,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17353, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17358,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17358, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17363,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17363, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -4694,9 +2749,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -4730,8 +2783,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 49, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -4768,8 +2820,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 3:
@@ -4793,9 +2844,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 64, 0x20);
                 break;
@@ -4826,8 +2875,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 6:
@@ -4854,8 +2902,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 49, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -4876,11 +2923,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x007C71F4 */
 static void flying_rc_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -4892,62 +2935,22 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17324,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17324, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17329,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17329, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17334,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17334, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17339,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17339, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -4958,9 +2961,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                     paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -4972,32 +2973,12 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17325,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17325, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17330,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17330, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 2:
@@ -5013,8 +2994,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 3:
@@ -5026,54 +3006,22 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17331,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17331, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17336,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17336, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17341,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17341, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 64, 0x20);
                 break;
@@ -5085,17 +3033,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17327,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17327, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
@@ -5108,17 +3046,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17342,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17342, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                 }
@@ -5126,8 +3054,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 6:
@@ -5135,62 +3062,22 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17328,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17328, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17333,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17333, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17338,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17338, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17343,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17343, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -5206,9 +3093,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -5242,8 +3127,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 49, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5280,8 +3164,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 3:
@@ -5305,9 +3188,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 64, 0x20);
                 break;
@@ -5338,8 +3219,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 6:
@@ -5366,8 +3246,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 49, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5388,11 +3267,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x007C7204 */
 static void flying_rc_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -5401,11 +3276,7 @@ static void flying_rc_track_left_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x007C7214 */
 static void flying_rc_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -5414,11 +3285,7 @@ static void flying_rc_track_right_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x007C7224 */
 static void flying_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -5430,62 +3297,22 @@ static void flying_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17308,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17308, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17312,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17312, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17311,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17311, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17315,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17315, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -5496,9 +3323,7 @@ static void flying_rc_track_s_bend_left(
                     paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -5519,32 +3344,12 @@ static void flying_rc_track_s_bend_left(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17310,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17310, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17314,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17314, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -5552,8 +3357,7 @@ static void flying_rc_track_s_bend_left(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -5561,32 +3365,12 @@ static void flying_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17310,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17310, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17314,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17314, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
@@ -5606,8 +3390,7 @@ static void flying_rc_track_s_bend_left(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -5615,62 +3398,22 @@ static void flying_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17311,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17311, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17315,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17315, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17308,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17308, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17312,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17312, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -5686,9 +3429,7 @@ static void flying_rc_track_s_bend_left(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -5703,70 +3444,28 @@ static void flying_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27253,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27253, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27257,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27257, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27256,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27256, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27260,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27260, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5782,62 +3481,22 @@ static void flying_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27254,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27254, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27258,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27258, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27255,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27255, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27259,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27259, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -5846,8 +3505,7 @@ static void flying_rc_track_s_bend_left(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -5867,62 +3525,22 @@ static void flying_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27255,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27255, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27259,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27259, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27254,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27254, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27258,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27258, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
@@ -5931,8 +3549,7 @@ static void flying_rc_track_s_bend_left(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 2:
@@ -5952,70 +3569,28 @@ static void flying_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27256,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27256, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27260,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27260, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27253,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27253, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27257,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27257, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6037,11 +3612,7 @@ static void flying_rc_track_s_bend_left(
 
 /** rct2: 0x007C7234 */
 static void flying_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -6053,62 +3624,22 @@ static void flying_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17316,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17316, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17320,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17320, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17319,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17319, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17323,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17323, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -6119,9 +3650,7 @@ static void flying_rc_track_s_bend_right(
                     paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -6130,34 +3659,14 @@ static void flying_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17317,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17317, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17321,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17321, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6175,8 +3684,7 @@ static void flying_rc_track_s_bend_right(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -6192,34 +3700,14 @@ static void flying_rc_track_s_bend_right(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17317,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17317, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17321,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17321, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6229,8 +3717,7 @@ static void flying_rc_track_s_bend_right(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -6238,62 +3725,22 @@ static void flying_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17319,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17319, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17323,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17323, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17316,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17316, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17320,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17320, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -6309,9 +3756,7 @@ static void flying_rc_track_s_bend_right(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -6326,70 +3771,28 @@ static void flying_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27261,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27261, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27265,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27265, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27264,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27264, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27268,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27268, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6405,62 +3808,22 @@ static void flying_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27262,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27262, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27266,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27266, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27263,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27263, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27267,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27267, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
@@ -6469,8 +3832,7 @@ static void flying_rc_track_s_bend_right(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -6490,62 +3852,22 @@ static void flying_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27263,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27263, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27267,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27267, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27262,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27262, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27266,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27266, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -6554,8 +3876,7 @@ static void flying_rc_track_s_bend_right(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 2:
@@ -6575,70 +3896,28 @@ static void flying_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27264,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27264, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27268,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27268, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27261,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27261, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27265,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27265, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6660,11 +3939,7 @@ static void flying_rc_track_s_bend_right(
 
 /** rct2: 0x007C7274 */
 static void flying_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -6676,62 +3951,22 @@ static void flying_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17229,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17229, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17232,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17232, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17235,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17235, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17226,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17226, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -6742,9 +3977,7 @@ static void flying_rc_track_left_quarter_turn_3(
                     paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -6756,69 +3989,27 @@ static void flying_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17228,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17228, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17231,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17231, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17234,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17234, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17225,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17225, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -6827,62 +4018,22 @@ static void flying_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17227,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17227, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17230,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17230, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17233,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17233, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17224,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17224, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -6898,9 +4049,7 @@ static void flying_rc_track_left_quarter_turn_3(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -6915,62 +4064,22 @@ static void flying_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27392,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27392, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27395,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27395, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27398,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27398, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27389,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27389, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -6978,8 +4087,7 @@ static void flying_rc_track_left_quarter_turn_3(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -6997,69 +4105,27 @@ static void flying_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27391,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27391, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27394,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27394, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27397,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27397, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27388,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27388, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -7068,62 +4134,22 @@ static void flying_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27390,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27390, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27393,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27393, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27396,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27396, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27387,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27387, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                 }
@@ -7131,8 +4157,7 @@ static void flying_rc_track_left_quarter_turn_3(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -7153,11 +4178,7 @@ static void flying_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x007C7284 */
 static void flying_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -7166,11 +4187,7 @@ static void flying_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x007C7294 */
 static void flying_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -7182,75 +4199,25 @@ static void flying_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17241,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17241, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17248,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17248, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17244,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17244, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17247,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17247, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17238,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17238, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -7261,9 +4228,7 @@ static void flying_rc_track_left_quarter_turn_3_bank(
                     paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -7275,69 +4240,27 @@ static void flying_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17240,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17240, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17243,
-                            0,
-                            0,
-                            16,
-                            16,
-                            1,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17243, 0, 0, 16, 16, 1, height, 0, 0,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17246,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17246, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17237,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17237, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -7346,75 +4269,25 @@ static void flying_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17239,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17239, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17242,
-                            0,
-                            0,
-                            1,
-                            32,
-                            26,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17242, 0, 0, 1, 32, 26, height, 27, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17245,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17245, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17249,
-                            0,
-                            0,
-                            1,
-                            32,
-                            26,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17249, 0, 0, 1, 32, 26, height, 27, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17236,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17236, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -7430,9 +4303,7 @@ static void flying_rc_track_left_quarter_turn_3_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -7447,62 +4318,22 @@ static void flying_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27404,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27404, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27407,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27407, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27410,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27410, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27401,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27401, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -7510,8 +4341,7 @@ static void flying_rc_track_left_quarter_turn_3_bank(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -7529,69 +4359,27 @@ static void flying_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27403,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27403, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27406,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27406, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27409,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27409, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27400,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27400, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -7600,62 +4388,22 @@ static void flying_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27402,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27402, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27405,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27405, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27408,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27408, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27399,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27399, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                 }
@@ -7663,8 +4411,7 @@ static void flying_rc_track_left_quarter_turn_3_bank(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -7685,11 +4432,7 @@ static void flying_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x007C72A4 */
 static void flying_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -7698,11 +4441,7 @@ static void flying_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x007C72B4 */
 static void flying_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -7736,9 +4475,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up(
                     paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -7780,9 +4517,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -7816,8 +4551,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 47, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -7857,8 +4591,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 47, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -7879,11 +4612,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x007C72C4 */
 static void flying_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -7917,9 +4646,7 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up(
                     paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -7967,9 +4694,7 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -8003,8 +4728,7 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 47, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8044,8 +4768,7 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 47, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8066,11 +4789,7 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x007C72D4 */
 static void flying_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -8079,11 +4798,7 @@ static void flying_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x007C72E4 */
 static void flying_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -8092,11 +4807,7 @@ static void flying_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x007C7314 */
 static void flying_rc_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8108,32 +4819,12 @@ static void flying_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17399, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17406,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17406, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17402,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17402, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -8152,10 +4843,8 @@ static void flying_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -8166,62 +4855,22 @@ static void flying_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17398,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17398, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17401,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17401, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17404,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17404, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17395,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17395, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -8238,34 +4887,14 @@ static void flying_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17400,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17400, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17403, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17407,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17407, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -8285,10 +4914,8 @@ static void flying_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -8302,32 +4929,12 @@ static void flying_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17399, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17406,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17406, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17402,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17402, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -8347,10 +4954,8 @@ static void flying_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -8361,62 +4966,22 @@ static void flying_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17395,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17395, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17398,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17398, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17401,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17401, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17404,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17404, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -8437,34 +5002,14 @@ static void flying_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17400,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17400, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17403, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17407,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17407, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -8475,10 +5020,8 @@ static void flying_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -8486,11 +5029,7 @@ static void flying_rc_track_left_half_banked_helix_up_small(
 
 /** rct2: 0x007C7324 */
 static void flying_rc_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8508,34 +5047,14 @@ static void flying_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17386,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17386, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17389, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17393,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17393, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -8546,10 +5065,8 @@ static void flying_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -8560,62 +5077,22 @@ static void flying_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17381,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17381, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17384,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17384, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17387,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17387, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17390,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17390, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -8634,32 +5111,12 @@ static void flying_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17385, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17392,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17392, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17388,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17388, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -8679,10 +5136,8 @@ static void flying_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -8694,34 +5149,14 @@ static void flying_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17386,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17386, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17389, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17393,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17393, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -8741,10 +5176,8 @@ static void flying_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -8755,62 +5188,22 @@ static void flying_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17384,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17384, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17387,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17387, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17390,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17390, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17381,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17381, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -8825,32 +5218,12 @@ static void flying_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17385, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17392,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17392, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17388,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17388, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -8869,10 +5242,8 @@ static void flying_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -8880,11 +5251,7 @@ static void flying_rc_track_right_half_banked_helix_up_small(
 
 /** rct2: 0x007C7334 */
 static void flying_rc_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -8899,11 +5266,7 @@ static void flying_rc_track_left_half_banked_helix_down_small(
 
 /** rct2: 0x007C7344 */
 static void flying_rc_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -8918,11 +5281,7 @@ static void flying_rc_track_right_half_banked_helix_down_small(
 
 /** rct2: 0x007C7354 */
 static void flying_rc_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8934,32 +5293,12 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17439, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17450,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17450, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17444,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17444, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -8978,10 +5317,8 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -8996,47 +5333,17 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17443,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17443, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17448,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17448, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17433,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17433, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -9044,8 +5351,7 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -9053,47 +5359,17 @@ static void flying_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17437,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17437, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17442,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17442, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17447,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17447, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -9113,32 +5389,12 @@ static void flying_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17436,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17436, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17441,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17441, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -9147,17 +5403,7 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17431,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17431, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -9165,8 +5411,7 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -9178,34 +5423,14 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17440,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17440, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17445, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17451,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17451, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -9225,10 +5450,8 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -9242,32 +5465,12 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17439, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17450,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17450, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17444,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17444, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -9287,10 +5490,8 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -9301,17 +5502,7 @@ static void flying_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17433,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17433, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -9320,32 +5511,12 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17443,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17443, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17448,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17448, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -9353,8 +5524,7 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -9366,47 +5536,17 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17437,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17437, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17442,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17442, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17447,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17447, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -9422,47 +5562,17 @@ static void flying_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17431,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17431, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17436,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17436, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17441,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17441, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -9474,8 +5584,7 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -9491,34 +5600,14 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17440,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17440, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17445, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17451,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17451, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -9529,10 +5618,8 @@ static void flying_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -9540,11 +5627,7 @@ static void flying_rc_track_left_half_banked_helix_up_large(
 
 /** rct2: 0x007C7364 */
 static void flying_rc_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9562,34 +5645,14 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17418,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17418, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17423, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17429,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17429, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -9600,10 +5663,8 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -9614,47 +5675,17 @@ static void flying_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17409,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17409, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17414,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17414, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17419,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17419, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -9666,8 +5697,7 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -9679,47 +5709,17 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17415,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17415, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17420,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17420, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17425,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17425, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -9735,17 +5735,7 @@ static void flying_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17411,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17411, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -9754,32 +5744,12 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17421,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17421, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17426,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17426, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -9787,8 +5757,7 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -9802,32 +5771,12 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17417, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17428,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17428, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17422,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17422, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -9847,10 +5796,8 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -9862,34 +5809,14 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17418,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17418, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17423, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17429,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17429, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -9909,10 +5836,8 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -9923,32 +5848,12 @@ static void flying_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17414,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17414, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17419,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17419, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -9957,17 +5862,7 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17409,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17409, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -9975,8 +5870,7 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -9984,47 +5878,17 @@ static void flying_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17415,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17415, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17420,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17420, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17425,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17425, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -10048,47 +5912,17 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17421,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17421, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17426,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17426, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17411,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17411, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -10096,8 +5930,7 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -10107,32 +5940,12 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 17417, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17428,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17428, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17422,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17422, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -10151,10 +5964,8 @@ static void flying_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -10162,11 +5973,7 @@ static void flying_rc_track_right_half_banked_helix_up_large(
 
 /** rct2: 0x007C7374 */
 static void flying_rc_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -10181,11 +5988,7 @@ static void flying_rc_track_left_half_banked_helix_down_large(
 
 /** rct2: 0x007C7384 */
 static void flying_rc_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -10200,11 +6003,7 @@ static void flying_rc_track_right_half_banked_helix_down_large(
 
 /** rct2: 0x007C73B4 */
 static void flying_rc_track_left_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -10215,68 +6014,28 @@ static void flying_rc_track_left_quarter_turn_1_60_deg_up(
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17301, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17305,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17305, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 1:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17302, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17306,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17306, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 2:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17303, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17307,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17307, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 3:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17300, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17304,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17304, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
         }
@@ -10287,114 +6046,34 @@ static void flying_rc_track_left_quarter_turn_1_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27352,
-                    0,
-                    0,
-                    28,
-                    28,
-                    3,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27352, 0, 0, 28, 28, 3, height - 5, 2, 2,
                     height - 5);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27348,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27348, 0, 0, 28, 28, 1, height - 5, 2, 2,
                     height + 94);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27353,
-                    0,
-                    0,
-                    28,
-                    28,
-                    3,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27353, 0, 0, 28, 28, 3, height - 5, 2, 2,
                     height - 5);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27349,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27349, 0, 0, 28, 28, 1, height - 5, 2, 2,
                     height + 94);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27354,
-                    0,
-                    0,
-                    28,
-                    28,
-                    3,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27354, 0, 0, 28, 28, 3, height - 5, 2, 2,
                     height - 5);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27350,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27350, 0, 0, 28, 28, 1, height - 5, 2, 2,
                     height + 94);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27351,
-                    0,
-                    0,
-                    28,
-                    28,
-                    3,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27351, 0, 0, 28, 28, 3, height - 5, 2, 2,
                     height - 5);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27347,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27347, 0, 0, 28, 28, 1, height - 5, 2, 2,
                     height + 94);
                 break;
         }
@@ -10407,11 +6086,7 @@ static void flying_rc_track_left_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x007C7394 */
 static void flying_rc_track_right_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -10422,68 +6097,28 @@ static void flying_rc_track_right_quarter_turn_1_60_deg_up(
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17292, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17296,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17296, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 1:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17293, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17297,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17297, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 2:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17294, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17298,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17298, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 3:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 17295, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17299,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17299, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
         }
@@ -10494,114 +6129,34 @@ static void flying_rc_track_right_quarter_turn_1_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27343,
-                    0,
-                    0,
-                    28,
-                    28,
-                    3,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27343, 0, 0, 28, 28, 3, height - 5, 2, 2,
                     height - 5);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27339,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27339, 0, 0, 28, 28, 1, height - 5, 2, 2,
                     height + 94);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27344,
-                    0,
-                    0,
-                    28,
-                    28,
-                    3,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27344, 0, 0, 28, 28, 3, height - 5, 2, 2,
                     height - 5);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27340,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27340, 0, 0, 28, 28, 1, height - 5, 2, 2,
                     height + 94);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27345,
-                    0,
-                    0,
-                    28,
-                    28,
-                    3,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27345, 0, 0, 28, 28, 3, height - 5, 2, 2,
                     height - 5);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27341,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27341, 0, 0, 28, 28, 1, height - 5, 2, 2,
                     height + 94);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27346,
-                    0,
-                    0,
-                    28,
-                    28,
-                    3,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27346, 0, 0, 28, 28, 3, height - 5, 2, 2,
                     height - 5);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27342,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height - 5,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27342, 0, 0, 28, 28, 1, height - 5, 2, 2,
                     height + 94);
                 break;
         }
@@ -10613,11 +6168,7 @@ static void flying_rc_track_right_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x007C73A4 */
 static void flying_rc_track_left_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement);
@@ -10625,11 +6176,7 @@ static void flying_rc_track_left_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x007C73C4 */
 static void flying_rc_track_right_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement);
@@ -10637,11 +6184,7 @@ static void flying_rc_track_right_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x007C73D4 */
 static void flying_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -10676,33 +6219,13 @@ static void flying_rc_track_brakes(
             case 0:
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27337,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27337, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 1:
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27338,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27338, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
         }
@@ -10722,11 +6245,7 @@ static void flying_rc_track_brakes(
 
 /** rct2: 0x007C7674 */
 static void flying_rc_track_left_quarter_banked_helix_large_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10736,71 +6255,29 @@ static void flying_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27202,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27202, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27207,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27207, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27212,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27212, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27197,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27197, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 41, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -10818,62 +6295,22 @@ static void flying_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27201,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27201, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27206,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27206, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27211,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27211, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27196,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27196, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
             }
@@ -10881,8 +6318,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -10890,62 +6326,22 @@ static void flying_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27200,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27200, 0, 0, 16, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27205,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27205, 0, 0, 16, 16, 3, height + 24, 16, 16,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27210,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27210, 0, 0, 16, 16, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27195,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27195, 0, 0, 16, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
             }
@@ -10961,62 +6357,22 @@ static void flying_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27199,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27199, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27204,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27204, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27209,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27209, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27194,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27194, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
             }
@@ -11024,8 +6380,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -11033,71 +6388,29 @@ static void flying_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27198,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27198, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27203,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27203, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27208,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27208, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27193,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27193, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 53, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -11117,11 +6430,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_up(
 
 /** rct2: 0x007C7684 */
 static void flying_rc_track_right_quarter_banked_helix_large_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11131,71 +6440,29 @@ static void flying_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27173,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27173, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27178,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27178, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27183,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27183, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27188,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27188, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 41, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -11213,62 +6480,22 @@ static void flying_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27174,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27174, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27179,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27179, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27184,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27184, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27189,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27189, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
             }
@@ -11276,8 +6503,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -11285,62 +6511,22 @@ static void flying_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27175,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27175, 0, 0, 16, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27180,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27180, 0, 0, 16, 16, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27185,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27185, 0, 0, 16, 16, 3, height + 24, 16, 16,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27190,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27190, 0, 0, 16, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
             }
@@ -11356,62 +6542,22 @@ static void flying_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27176,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27176, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27181,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27181, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27186,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27186, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27191,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27191, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
             }
@@ -11419,8 +6565,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -11428,71 +6573,29 @@ static void flying_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27177,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27177, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27182,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27182, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27187,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27187, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27192,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27192, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 53, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -11512,11 +6615,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_up(
 
 /** rct2: 0x007C7694 */
 static void flying_rc_track_left_quarter_banked_helix_large_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11526,71 +6625,29 @@ static void flying_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27182,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27182, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27187,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27187, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27192,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27192, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27177,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27177, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 53, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -11608,62 +6665,22 @@ static void flying_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27181,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27181, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27186,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27186, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27191,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27191, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27176,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27176, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
             }
@@ -11671,8 +6688,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -11680,62 +6696,22 @@ static void flying_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27180,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27180, 0, 0, 16, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27185,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27185, 0, 0, 16, 16, 3, height + 24, 16, 16,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27190,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27190, 0, 0, 16, 16, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27175,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27175, 0, 0, 16, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
             }
@@ -11751,62 +6727,22 @@ static void flying_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27179,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27179, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27184,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27184, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27189,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27189, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27174,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27174, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
             }
@@ -11814,8 +6750,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -11823,71 +6758,29 @@ static void flying_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27178,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27178, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27183,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27183, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27188,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27188, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27173,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27173, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 41, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -11907,11 +6800,7 @@ static void flying_rc_track_left_quarter_banked_helix_large_down(
 
 /** rct2: 0x007C76A4 */
 static void flying_rc_track_right_quarter_banked_helix_large_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11921,71 +6810,29 @@ static void flying_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27193,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27193, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27198,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27198, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27203,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27203, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27208,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27208, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 53, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -12003,62 +6850,22 @@ static void flying_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27194,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27194, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27199,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27199, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27204,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27204, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27209,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27209, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
             }
@@ -12066,8 +6873,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -12075,62 +6881,22 @@ static void flying_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27195,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27195, 0, 0, 16, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27200,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27200, 0, 0, 16, 16, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27205,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27205, 0, 0, 16, 16, 3, height + 24, 16, 16,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27210,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27210, 0, 0, 16, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
             }
@@ -12146,62 +6912,22 @@ static void flying_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27196,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27196, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27201,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27201, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27206,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27206, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27211,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27211, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
             }
@@ -12209,8 +6935,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -12218,71 +6943,29 @@ static void flying_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27197,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27197, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27202,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27202, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27207,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27207, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27212,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27212, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 41, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -12302,11 +6985,7 @@ static void flying_rc_track_right_quarter_banked_helix_large_down(
 
 /** rct2: 0x007C78B4 */
 static void flying_rc_track_25_deg_up_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -12353,62 +7032,22 @@ static void flying_rc_track_25_deg_up_left_banked(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27711,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27711, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27712,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27712, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27713,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27713, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27714,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27714, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
         }
@@ -12452,11 +7091,7 @@ static void flying_rc_track_25_deg_up_left_banked(
 
 /** rct2: 0x007C78C4 */
 static void flying_rc_track_25_deg_up_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -12503,62 +7138,22 @@ static void flying_rc_track_25_deg_up_right_banked(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27715,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27715, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27716,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27716, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27717,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27717, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27718,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27718, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
         }
@@ -12602,11 +7197,7 @@ static void flying_rc_track_25_deg_up_right_banked(
 
 /** rct2: 0x007C73E4 */
 static void flying_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -12666,17 +7257,7 @@ static void flying_rc_track_on_ride_photo(
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27129,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27129, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 1:
@@ -12686,17 +7267,7 @@ static void flying_rc_track_on_ride_photo(
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27130,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27130, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 2:
@@ -12706,17 +7277,7 @@ static void flying_rc_track_on_ride_photo(
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27129,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27129, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 3:
@@ -12726,17 +7287,7 @@ static void flying_rc_track_on_ride_photo(
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27130,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27130, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
         }
@@ -12749,11 +7300,7 @@ static void flying_rc_track_on_ride_photo(
 
 /** rct2: 0x007C78D4 */
 static void flying_rc_track_25_deg_down_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -12761,11 +7308,7 @@ static void flying_rc_track_25_deg_down_left_banked(
 
 /** rct2: 0x007C78E4 */
 static void flying_rc_track_25_deg_down_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -12773,11 +7316,7 @@ static void flying_rc_track_25_deg_down_right_banked(
 
 /** rct2: 0x007C7404 */
 static void flying_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -12789,62 +7328,22 @@ static void flying_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17546,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17546, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17550,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17550, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17554,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17554, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17558,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17558, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -12863,62 +7362,22 @@ static void flying_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17547,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17547, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17551,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17551, 0, 0, 34, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17555,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17555, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17559,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17559, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -12926,8 +7385,7 @@ static void flying_rc_track_left_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -12935,77 +7393,34 @@ static void flying_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17548,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17548, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17552,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17552, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17556,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17556, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17560,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17560, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -13014,68 +7429,28 @@ static void flying_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17549,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17549, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17553,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17553, 0, 0, 16, 18, 3, height, 0, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17557,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17557, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17561,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17561, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -13085,8 +7460,7 @@ static void flying_rc_track_left_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
         }
@@ -13100,62 +7474,22 @@ static void flying_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27507,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27507, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27511,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27511, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27515,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27515, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27519,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27519, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -13176,71 +7510,30 @@ static void flying_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27508,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27508, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27512,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27512, 0, 0, 34, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27516,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27516, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27520,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27520, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -13248,77 +7541,34 @@ static void flying_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27509,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27509, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27513,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27513, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27517,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27517, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27521,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27521, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -13327,63 +7577,23 @@ static void flying_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27510,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27510, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27514,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27514, 0, 0, 16, 18, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27518,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27518, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27522,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27522, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                 }
 
@@ -13391,8 +7601,7 @@ static void flying_rc_track_left_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -13421,11 +7630,7 @@ static void flying_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x007C7414 */
 static void flying_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -13437,62 +7642,22 @@ static void flying_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17530,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17530, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17534,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17534, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17538,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17538, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17542,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17542, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -13511,62 +7676,22 @@ static void flying_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17531,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17531, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17535,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17535, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17539,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17539, 0, 0, 34, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17543,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17543, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
@@ -13574,8 +7699,7 @@ static void flying_rc_track_right_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -13583,77 +7707,34 @@ static void flying_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17532,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17532, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17536,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17536, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17540,
-                            0,
-                            0,
-                            28,
-                            28,
-                            3,
-                            height,
-                            4,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17540, 0, 0, 28, 28, 3, height, 4, 4,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17544,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17544, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -13662,68 +7743,28 @@ static void flying_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17533,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17533, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17537,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17537, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17541,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17541, 0, 0, 16, 18, 3, height, 0, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17545,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17545, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -13733,8 +7774,7 @@ static void flying_rc_track_right_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
         }
@@ -13748,62 +7788,22 @@ static void flying_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27491,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27491, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27495,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27495, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27499,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27499, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27503,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27503, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -13824,62 +7824,22 @@ static void flying_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27492,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27492, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27496,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27496, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27500,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27500, 0, 0, 34, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27504,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27504, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
@@ -13887,8 +7847,7 @@ static void flying_rc_track_right_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -13896,77 +7855,34 @@ static void flying_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27493,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27493, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27497,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27497, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27501,
-                            0,
-                            0,
-                            28,
-                            28,
-                            3,
-                            height + 24,
-                            4,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27501, 0, 0, 28, 28, 3, height + 24, 4, 4,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27505,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27505, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -13975,63 +7891,23 @@ static void flying_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27494,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27494, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27498,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27498, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27502,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27502, 0, 0, 16, 18, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27506,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27506, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                 }
 
@@ -14039,8 +7915,7 @@ static void flying_rc_track_right_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -14069,11 +7944,7 @@ static void flying_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x007C7424 */
 static void flying_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -14082,11 +7953,7 @@ static void flying_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x007C7434 */
 static void flying_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -14095,11 +7962,7 @@ static void flying_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x007C7444 */
 static void flying_rc_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -14111,62 +7974,22 @@ static void flying_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17578,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17578, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17582,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17582, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17586,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17586, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17590,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17590, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -14185,62 +8008,22 @@ static void flying_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17579,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17579, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17583,
-                            0,
-                            0,
-                            34,
-                            16,
-                            0,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17583, 0, 0, 34, 16, 0, height, 0, 0,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17587,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17587, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17591,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17591, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -14248,8 +8031,7 @@ static void flying_rc_track_left_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -14257,77 +8039,34 @@ static void flying_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17580,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17580, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17584,
-                            0,
-                            0,
-                            16,
-                            16,
-                            0,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17584, 0, 0, 16, 16, 0, height, 16, 16,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17588,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17588, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17592,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17592, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -14336,68 +8075,28 @@ static void flying_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17581,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17581, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17585,
-                            0,
-                            0,
-                            16,
-                            18,
-                            0,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17585, 0, 0, 16, 18, 0, height, 0, 16,
                             height + 27);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17589,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17589, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17593,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17593, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -14407,8 +8106,7 @@ static void flying_rc_track_left_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
         }
@@ -14422,70 +8120,28 @@ static void flying_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27539,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27539, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27543,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27543, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27547,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27547, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27551,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27551, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
@@ -14501,71 +8157,30 @@ static void flying_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27540,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27540, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27544,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27544, 0, 0, 34, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27548,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27548, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27552,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27552, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -14573,77 +8188,34 @@ static void flying_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27541,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27541, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27545,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27545, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27549,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27549, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27553,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27553, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -14652,63 +8224,23 @@ static void flying_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27542,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27542, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27546,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27546, 0, 0, 16, 18, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27550,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27550, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27554,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27554, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                 }
 
@@ -14716,8 +8248,7 @@ static void flying_rc_track_left_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -14746,11 +8277,7 @@ static void flying_rc_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x007C7454 */
 static void flying_rc_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -14762,62 +8289,22 @@ static void flying_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17562,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17562, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17566,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17566, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17570,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17570, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17574,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17574, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                 }
@@ -14836,62 +8323,22 @@ static void flying_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17563,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17563, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17567,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17567, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17571,
-                            0,
-                            0,
-                            34,
-                            16,
-                            0,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17571, 0, 0, 34, 16, 0, height, 0, 0,
                             height + 27);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17575,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17575, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
@@ -14899,8 +8346,7 @@ static void flying_rc_track_right_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -14908,77 +8354,34 @@ static void flying_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17564,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17564, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17568,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17568, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17572,
-                            0,
-                            0,
-                            28,
-                            28,
-                            0,
-                            height,
-                            4,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17572, 0, 0, 28, 28, 0, height, 4, 4,
                             height + 27);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17576,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17576, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -14987,68 +8390,28 @@ static void flying_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17565,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17565, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17569,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17569, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17573,
-                            0,
-                            0,
-                            16,
-                            18,
-                            0,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17573, 0, 0, 16, 18, 0, height, 0, 16,
                             height + 27);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17577,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17577, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -15058,8 +8421,7 @@ static void flying_rc_track_right_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
         }
@@ -15073,70 +8435,28 @@ static void flying_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27523,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27523, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27527,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27527, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27531,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27531, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27535,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27535, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
@@ -15152,62 +8472,22 @@ static void flying_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27524,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27524, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27528,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27528, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27532,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27532, 0, 0, 34, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27536,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27536, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
@@ -15215,8 +8495,7 @@ static void flying_rc_track_right_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -15224,77 +8503,34 @@ static void flying_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27525,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27525, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27529,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27529, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27533,
-                            0,
-                            0,
-                            28,
-                            28,
-                            3,
-                            height + 24,
-                            4,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27533, 0, 0, 28, 28, 3, height + 24, 4, 4,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27537,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27537, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -15303,63 +8539,23 @@ static void flying_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27526,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27526, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27530,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27530, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27534,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27534, 0, 0, 16, 18, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27538,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27538, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                 }
 
@@ -15367,8 +8563,7 @@ static void flying_rc_track_right_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -15397,11 +8592,7 @@ static void flying_rc_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x007C7464 */
 static void flying_rc_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -15410,11 +8601,7 @@ static void flying_rc_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x007C7474 */
 static void flying_rc_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -15423,11 +8610,7 @@ static void flying_rc_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x007C73F4 */
 static void flying_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -15441,18 +8624,8 @@ static void flying_rc_track_diag_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17861,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17861, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15462,25 +8635,13 @@ static void flying_rc_track_diag_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17791,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17791, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -15491,18 +8652,8 @@ static void flying_rc_track_diag_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17858,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17858, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15512,25 +8663,13 @@ static void flying_rc_track_diag_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17788,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17788, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -15541,18 +8680,8 @@ static void flying_rc_track_diag_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17860,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17860, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15562,25 +8691,13 @@ static void flying_rc_track_diag_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17790,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17790, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -15595,18 +8712,8 @@ static void flying_rc_track_diag_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17859,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17859, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_a_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -15630,18 +8737,8 @@ static void flying_rc_track_diag_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17789,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17789, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_a_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -15656,9 +8753,7 @@ static void flying_rc_track_diag_flat(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -15675,18 +8770,8 @@ static void flying_rc_track_diag_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27614,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27614, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
@@ -15696,25 +8781,13 @@ static void flying_rc_track_diag_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27558,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27558, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -15725,18 +8798,8 @@ static void flying_rc_track_diag_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27611,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27611, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
@@ -15746,25 +8809,13 @@ static void flying_rc_track_diag_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27555,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27555, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -15775,18 +8826,8 @@ static void flying_rc_track_diag_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27613,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27613, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
@@ -15796,25 +8837,13 @@ static void flying_rc_track_diag_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27557,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27557, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -15825,18 +8854,8 @@ static void flying_rc_track_diag_flat(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27612,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27612, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
@@ -15846,26 +8865,14 @@ static void flying_rc_track_diag_flat(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27556,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27556, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -15895,11 +8902,7 @@ static void flying_rc_track_diag_flat(
 
 /** rct2: 0x007C74A4 */
 static void flying_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -15913,18 +8916,8 @@ static void flying_rc_track_diag_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17873,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17873, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15934,25 +8927,13 @@ static void flying_rc_track_diag_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17803,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17803, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -15963,18 +8944,8 @@ static void flying_rc_track_diag_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17870,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17870, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15984,25 +8955,13 @@ static void flying_rc_track_diag_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17800,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17800, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -16013,18 +8972,8 @@ static void flying_rc_track_diag_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17872,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17872, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16034,25 +8983,13 @@ static void flying_rc_track_diag_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17802,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17802, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -16067,18 +9004,8 @@ static void flying_rc_track_diag_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17871,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17871, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -16102,18 +9029,8 @@ static void flying_rc_track_diag_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17801,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17801, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -16128,9 +9045,7 @@ static void flying_rc_track_diag_25_deg_up(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -16147,18 +9062,8 @@ static void flying_rc_track_diag_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27626,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27626, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
@@ -16168,25 +9073,13 @@ static void flying_rc_track_diag_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27570,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27570, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -16197,18 +9090,8 @@ static void flying_rc_track_diag_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27623,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27623, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
@@ -16218,25 +9101,13 @@ static void flying_rc_track_diag_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27567,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27567, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -16247,18 +9118,8 @@ static void flying_rc_track_diag_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27625,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27625, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
@@ -16268,25 +9129,13 @@ static void flying_rc_track_diag_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27569,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27569, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -16297,18 +9146,8 @@ static void flying_rc_track_diag_25_deg_up(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27624,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27624, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
@@ -16318,26 +9157,14 @@ static void flying_rc_track_diag_25_deg_up(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27568,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27568, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -16367,11 +9194,7 @@ static void flying_rc_track_diag_25_deg_up(
 
 /** rct2: 0x007C7504 */
 static void flying_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -16385,18 +9208,8 @@ static void flying_rc_track_diag_60_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17885,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17885, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16406,25 +9219,13 @@ static void flying_rc_track_diag_60_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17815,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17815, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -16435,18 +9236,8 @@ static void flying_rc_track_diag_60_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17882,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17882, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16456,25 +9247,13 @@ static void flying_rc_track_diag_60_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17812,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17812, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -16485,18 +9264,8 @@ static void flying_rc_track_diag_60_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17884,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17884, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16506,25 +9275,13 @@ static void flying_rc_track_diag_60_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17814,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17814, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -16539,18 +9296,8 @@ static void flying_rc_track_diag_60_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17883,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17883, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 36, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -16574,18 +9321,8 @@ static void flying_rc_track_diag_60_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17813,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17813, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 36, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -16600,9 +9337,7 @@ static void flying_rc_track_diag_60_deg_up(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -16617,24 +9352,12 @@ static void flying_rc_track_diag_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27582,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27582, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -16643,24 +9366,12 @@ static void flying_rc_track_diag_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27579,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27579, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -16669,24 +9380,12 @@ static void flying_rc_track_diag_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27581,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27581, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -16695,25 +9394,13 @@ static void flying_rc_track_diag_60_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27580,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27580, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 24);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -16743,11 +9430,7 @@ static void flying_rc_track_diag_60_deg_up(
 
 /** rct2: 0x007C7484 */
 static void flying_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -16761,18 +9444,8 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17865,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17865, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16782,25 +9455,13 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17795,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17795, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16811,18 +9472,8 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17862,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17862, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16832,25 +9483,13 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17792,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17792, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16861,18 +9500,8 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17864,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17864, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16882,25 +9511,13 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17794,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17794, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16915,18 +9532,8 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17863,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17863, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -16950,18 +9557,8 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17793,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17793, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -16976,9 +9573,7 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16995,18 +9590,8 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27618,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27618, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -17016,25 +9601,13 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27562,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27562, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -17045,18 +9618,8 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27615,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27615, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -17066,25 +9629,13 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27559,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27559, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -17095,18 +9646,8 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27617,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27617, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -17116,25 +9657,13 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27561,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27561, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -17145,18 +9674,8 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27616,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27616, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -17166,26 +9685,14 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27560,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27560, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -17215,11 +9722,7 @@ static void flying_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x007C74E4 */
 static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -17233,18 +9736,8 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17877,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17877, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17254,25 +9747,13 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17807,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17807, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -17283,18 +9764,8 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17874,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17874, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17304,25 +9775,13 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17804,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17804, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -17333,18 +9792,8 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17876,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17876, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17354,25 +9803,13 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17806,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17806, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -17387,18 +9824,8 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17875,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17875, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -17422,18 +9849,8 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17805,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17805, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -17448,9 +9865,7 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -17465,24 +9880,12 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27574,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27574, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -17491,24 +9894,12 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27571,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27571, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -17517,24 +9908,12 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27573,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27573, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -17543,25 +9922,13 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27572,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27572, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -17591,11 +9958,7 @@ static void flying_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x007C74F4 */
 static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -17609,18 +9972,8 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17881,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17881, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17630,25 +9983,13 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17811,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17811, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -17659,18 +10000,8 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17878,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17878, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17680,25 +10011,13 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17808,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17808, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -17709,18 +10028,8 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17880,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17880, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17730,25 +10039,13 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17810,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17810, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -17763,18 +10060,8 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17879,
-                                -16,
-                                -16,
-                                16,
-                                16,
-                                3,
-                                height,
-                                0,
-                                0,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17879, -16, -16, 16, 16, 3, height, 0,
+                                0, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 21, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -17798,18 +10085,8 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17809,
-                                -16,
-                                -16,
-                                16,
-                                16,
-                                3,
-                                height,
-                                0,
-                                0,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17809, -16, -16, 16, 16, 3, height, 0,
+                                0, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 21, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -17824,9 +10101,7 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -17841,24 +10116,12 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27578,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27578, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -17867,24 +10130,12 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27575,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27575, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -17893,24 +10144,12 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27577,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27577, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -17919,25 +10158,13 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27576,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27576, -16, -16, 16, 16, 3, height + 24,
+                            0, 0, height + 56);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -17967,11 +10194,7 @@ static void flying_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x007C7494 */
 static void flying_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -17985,18 +10208,8 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17869,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17869, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18006,25 +10219,13 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17799,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17799, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18035,18 +10236,8 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17866,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17866, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18056,25 +10247,13 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17796,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17796, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18085,18 +10264,8 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17868,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17868, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18106,25 +10275,13 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17798,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17798, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18139,18 +10296,8 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17867,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17867, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -18174,18 +10321,8 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17797,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17797, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -18200,9 +10337,7 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18219,18 +10354,8 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27622,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27622, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -18240,25 +10365,13 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27566,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27566, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18269,18 +10382,8 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27619,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27619, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -18290,25 +10393,13 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27563,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27563, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18319,18 +10410,8 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27621,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27621, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -18340,25 +10421,13 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27565,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27565, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18369,18 +10438,8 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27620,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27620, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -18390,26 +10449,14 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 27564,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 27564, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -18439,11 +10486,7 @@ static void flying_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x007C74D4 */
 static void flying_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -18457,18 +10500,8 @@ static void flying_rc_track_diag_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17871,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17871, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18478,25 +10511,13 @@ static void flying_rc_track_diag_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17801,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17801, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18507,18 +10528,8 @@ static void flying_rc_track_diag_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17872,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17872, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18528,25 +10539,13 @@ static void flying_rc_track_diag_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17802,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17802, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18557,18 +10556,8 @@ static void flying_rc_track_diag_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17870,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17870, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18578,25 +10567,13 @@ static void flying_rc_track_diag_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17800,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17800, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18611,18 +10588,8 @@ static void flying_rc_track_diag_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17873,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17873, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -18646,18 +10613,8 @@ static void flying_rc_track_diag_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17803,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17803, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -18672,9 +10629,7 @@ static void flying_rc_track_diag_25_deg_down(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18689,24 +10644,12 @@ static void flying_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27568,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27568, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18715,24 +10658,12 @@ static void flying_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27569,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27569, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18741,24 +10672,12 @@ static void flying_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27567,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27567, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18767,25 +10686,13 @@ static void flying_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27570,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27570, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -18815,11 +10722,7 @@ static void flying_rc_track_diag_25_deg_down(
 
 /** rct2: 0x007C7534 */
 static void flying_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -18833,18 +10736,8 @@ static void flying_rc_track_diag_60_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17883,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17883, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18854,25 +10747,13 @@ static void flying_rc_track_diag_60_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17813,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17813, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -18883,18 +10764,8 @@ static void flying_rc_track_diag_60_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17884,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17884, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18904,25 +10775,13 @@ static void flying_rc_track_diag_60_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17814,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17814, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -18933,18 +10792,8 @@ static void flying_rc_track_diag_60_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17882,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17882, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18954,25 +10803,13 @@ static void flying_rc_track_diag_60_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17812,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17812, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -18987,18 +10824,8 @@ static void flying_rc_track_diag_60_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17885,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17885, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 28, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -19022,18 +10849,8 @@ static void flying_rc_track_diag_60_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17815,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17815, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 28, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -19048,9 +10865,7 @@ static void flying_rc_track_diag_60_deg_down(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -19065,24 +10880,12 @@ static void flying_rc_track_diag_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27580,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27580, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 24);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -19091,24 +10894,12 @@ static void flying_rc_track_diag_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27581,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27581, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -19117,24 +10908,12 @@ static void flying_rc_track_diag_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27579,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27579, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -19143,25 +10922,13 @@ static void flying_rc_track_diag_60_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27582,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27582, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -19191,11 +10958,7 @@ static void flying_rc_track_diag_60_deg_down(
 
 /** rct2: 0x007C74B4 */
 static void flying_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -19209,18 +10972,8 @@ static void flying_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17867,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17867, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -19230,25 +10983,13 @@ static void flying_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17797,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17797, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -19258,18 +10999,8 @@ static void flying_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17868,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17868, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -19279,25 +11010,13 @@ static void flying_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17798,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17798, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -19307,18 +11026,8 @@ static void flying_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17866,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17866, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -19328,25 +11037,13 @@ static void flying_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17796,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17796, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -19360,18 +11057,8 @@ static void flying_rc_track_diag_flat_to_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17869,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17869, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -19395,18 +11082,8 @@ static void flying_rc_track_diag_flat_to_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17799,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17799, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -19421,9 +11098,7 @@ static void flying_rc_track_diag_flat_to_25_deg_down(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 break;
         }
@@ -19437,24 +11112,12 @@ static void flying_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27564,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27564, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -19462,24 +11125,12 @@ static void flying_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27565,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27565, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -19487,24 +11138,12 @@ static void flying_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27563,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27563, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -19512,25 +11151,13 @@ static void flying_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27566,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27566, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -19560,11 +11187,7 @@ static void flying_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x007C7514 */
 static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -19578,18 +11201,8 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17879,
-                                -16,
-                                -16,
-                                16,
-                                16,
-                                3,
-                                height,
-                                0,
-                                0,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17879, -16, -16, 16, 16, 3, height, 0,
+                                0, height);
                             break;
                     }
                 }
@@ -19599,25 +11212,13 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17809,
-                                -16,
-                                -16,
-                                16,
-                                16,
-                                3,
-                                height,
-                                0,
-                                0,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17809, -16, -16, 16, 16, 3, height, 0,
+                                0, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -19628,18 +11229,8 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17880,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17880, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -19649,25 +11240,13 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17810,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17810, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -19678,18 +11257,8 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17878,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17878, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -19699,25 +11268,13 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17808,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17808, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -19732,18 +11289,8 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17881,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17881, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 17, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -19767,18 +11314,8 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17811,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17811, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 17, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -19793,9 +11330,7 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -19810,24 +11345,12 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27576,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27576, -16, -16, 16, 16, 3, height + 24,
+                            0, 0, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -19836,24 +11359,12 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27577,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27577, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -19862,24 +11373,12 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27575,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27575, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -19888,25 +11387,13 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27578,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27578, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -19936,11 +11423,7 @@ static void flying_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x007C7524 */
 static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -19954,18 +11437,8 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17875,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17875, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -19975,25 +11448,13 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17805,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17805, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -20004,18 +11465,8 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17876,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17876, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -20025,25 +11476,13 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17806,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17806, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -20054,18 +11493,8 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17874,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17874, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -20075,25 +11504,13 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17804,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17804, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -20108,18 +11525,8 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17877,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17877, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -20143,18 +11550,8 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17807,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17807, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -20169,9 +11566,7 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -20186,24 +11581,12 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27572,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27572, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -20212,24 +11595,12 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27573,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27573, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -20238,24 +11609,12 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27571,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27571, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -20264,25 +11623,13 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27574,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27574, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -20312,11 +11659,7 @@ static void flying_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x007C74C4 */
 static void flying_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -20330,18 +11673,8 @@ static void flying_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17863,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17863, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -20351,25 +11684,13 @@ static void flying_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17793,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17793, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -20380,18 +11701,8 @@ static void flying_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17864,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17864, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -20401,25 +11712,13 @@ static void flying_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17794,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17794, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -20430,18 +11729,8 @@ static void flying_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17862,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17862, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -20451,25 +11740,13 @@ static void flying_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17792,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17792, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -20484,18 +11761,8 @@ static void flying_rc_track_diag_25_deg_down_to_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17865,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17865, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -20519,18 +11786,8 @@ static void flying_rc_track_diag_25_deg_down_to_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 17795,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 17795, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -20545,9 +11802,7 @@ static void flying_rc_track_diag_25_deg_down_to_flat(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -20562,24 +11817,12 @@ static void flying_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27560,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27560, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -20588,24 +11831,12 @@ static void flying_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27561,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27561, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -20614,24 +11845,12 @@ static void flying_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27559,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27559, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -20640,25 +11859,13 @@ static void flying_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27562,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27562, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -20688,11 +11895,7 @@ static void flying_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x007C7564 */
 static void flying_rc_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -20704,24 +11907,12 @@ static void flying_rc_track_diag_flat_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17831,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17831, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20730,37 +11921,15 @@ static void flying_rc_track_diag_flat_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17828,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17828, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17832,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17832, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20769,24 +11938,12 @@ static void flying_rc_track_diag_flat_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17830,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17830, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20799,18 +11956,8 @@ static void flying_rc_track_diag_flat_to_left_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17829,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17829, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -20824,9 +11971,7 @@ static void flying_rc_track_diag_flat_to_left_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20841,24 +11986,12 @@ static void flying_rc_track_diag_flat_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27590,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27590, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20867,24 +12000,12 @@ static void flying_rc_track_diag_flat_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27587,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27587, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20893,24 +12014,12 @@ static void flying_rc_track_diag_flat_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27589,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27589, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20919,26 +12028,15 @@ static void flying_rc_track_diag_flat_to_left_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27588,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27588, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -20967,11 +12065,7 @@ static void flying_rc_track_diag_flat_to_left_bank(
 
 /** rct2: 0x007C7574 */
 static void flying_rc_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -20983,24 +12077,12 @@ static void flying_rc_track_diag_flat_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17836,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17836, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21009,24 +12091,12 @@ static void flying_rc_track_diag_flat_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17833,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17833, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21035,37 +12105,15 @@ static void flying_rc_track_diag_flat_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17835,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17835, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17837,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17837, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21078,18 +12126,8 @@ static void flying_rc_track_diag_flat_to_right_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17834,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17834, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -21103,9 +12141,7 @@ static void flying_rc_track_diag_flat_to_right_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21120,24 +12156,12 @@ static void flying_rc_track_diag_flat_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27594,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27594, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21146,24 +12170,12 @@ static void flying_rc_track_diag_flat_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27591,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27591, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21172,24 +12184,12 @@ static void flying_rc_track_diag_flat_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27593,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27593, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21198,26 +12198,15 @@ static void flying_rc_track_diag_flat_to_right_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27592,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27592, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -21246,11 +12235,7 @@ static void flying_rc_track_diag_flat_to_right_bank(
 
 /** rct2: 0x007C7584 */
 static void flying_rc_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -21262,24 +12247,12 @@ static void flying_rc_track_diag_left_bank_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17834,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17834, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21288,37 +12261,15 @@ static void flying_rc_track_diag_left_bank_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17835,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17835, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17837,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17837, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21327,24 +12278,12 @@ static void flying_rc_track_diag_left_bank_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17833,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17833, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21357,18 +12296,8 @@ static void flying_rc_track_diag_left_bank_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17836,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17836, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -21382,9 +12311,7 @@ static void flying_rc_track_diag_left_bank_to_flat(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21399,24 +12326,12 @@ static void flying_rc_track_diag_left_bank_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27592,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27592, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21425,24 +12340,12 @@ static void flying_rc_track_diag_left_bank_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27593,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27593, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21451,24 +12354,12 @@ static void flying_rc_track_diag_left_bank_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27591,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27591, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21477,26 +12368,15 @@ static void flying_rc_track_diag_left_bank_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27594,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27594, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -21525,11 +12405,7 @@ static void flying_rc_track_diag_left_bank_to_flat(
 
 /** rct2: 0x007C7594 */
 static void flying_rc_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -21541,24 +12417,12 @@ static void flying_rc_track_diag_right_bank_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17829,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17829, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21567,24 +12431,12 @@ static void flying_rc_track_diag_right_bank_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17830,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17830, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21593,37 +12445,15 @@ static void flying_rc_track_diag_right_bank_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17828,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17828, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17832,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17832, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21636,18 +12466,8 @@ static void flying_rc_track_diag_right_bank_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17831,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17831, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -21661,9 +12481,7 @@ static void flying_rc_track_diag_right_bank_to_flat(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21678,24 +12496,12 @@ static void flying_rc_track_diag_right_bank_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27588,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27588, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21704,24 +12510,12 @@ static void flying_rc_track_diag_right_bank_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27589,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27589, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21730,24 +12524,12 @@ static void flying_rc_track_diag_right_bank_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27587,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27587, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -21756,26 +12538,15 @@ static void flying_rc_track_diag_right_bank_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27590,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27590, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -21804,11 +12575,7 @@ static void flying_rc_track_diag_right_bank_to_flat(
 
 /** rct2: 0x007C75C4 */
 static void flying_rc_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -21820,24 +12587,12 @@ static void flying_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17851,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17851, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21846,37 +12601,15 @@ static void flying_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17848,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17848, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17852,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17852, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21885,24 +12618,12 @@ static void flying_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17850,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17850, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21915,18 +12636,8 @@ static void flying_rc_track_diag_left_bank_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17849,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17849, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -21940,9 +12651,7 @@ static void flying_rc_track_diag_left_bank_to_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21957,24 +12666,12 @@ static void flying_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27606,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27606, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21983,24 +12680,12 @@ static void flying_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27603,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27603, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22009,24 +12694,12 @@ static void flying_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27605,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27605, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22035,25 +12708,13 @@ static void flying_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27604,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27604, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -22083,11 +12744,7 @@ static void flying_rc_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x007C75D4 */
 static void flying_rc_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -22099,24 +12756,12 @@ static void flying_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17856,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17856, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22125,24 +12770,12 @@ static void flying_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17853,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17853, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22151,37 +12784,15 @@ static void flying_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17855,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17855, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17857,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17857, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22194,18 +12805,8 @@ static void flying_rc_track_diag_right_bank_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17854,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17854, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -22219,9 +12820,7 @@ static void flying_rc_track_diag_right_bank_to_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22236,24 +12835,12 @@ static void flying_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27610,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27610, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22262,24 +12849,12 @@ static void flying_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27607,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27607, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22288,24 +12863,12 @@ static void flying_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27609,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27609, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22314,25 +12877,13 @@ static void flying_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27608,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27608, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -22362,11 +12913,7 @@ static void flying_rc_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x007C75A4 */
 static void flying_rc_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -22378,24 +12925,12 @@ static void flying_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17841,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17841, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -22404,37 +12939,15 @@ static void flying_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17838,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17838, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17842,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17842, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -22443,24 +12956,12 @@ static void flying_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17840,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17840, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -22473,18 +12974,8 @@ static void flying_rc_track_diag_25_deg_up_to_left_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17839,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17839, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -22498,9 +12989,7 @@ static void flying_rc_track_diag_25_deg_up_to_left_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -22515,24 +13004,12 @@ static void flying_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27598,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27598, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -22541,24 +13018,12 @@ static void flying_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27595,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27595, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -22567,24 +13032,12 @@ static void flying_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27597,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27597, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -22593,25 +13046,13 @@ static void flying_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27596,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27596, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -22641,11 +13082,7 @@ static void flying_rc_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x007C75B4 */
 static void flying_rc_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -22657,24 +13094,12 @@ static void flying_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17846,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17846, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -22683,24 +13108,12 @@ static void flying_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17843,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17843, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -22709,37 +13122,15 @@ static void flying_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17845,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17845, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17847,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17847, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -22752,18 +13143,8 @@ static void flying_rc_track_diag_25_deg_up_to_right_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17844,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17844, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -22777,9 +13158,7 @@ static void flying_rc_track_diag_25_deg_up_to_right_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -22794,24 +13173,12 @@ static void flying_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27602,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27602, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -22820,24 +13187,12 @@ static void flying_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27599,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27599, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -22846,24 +13201,12 @@ static void flying_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27601,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27601, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -22872,25 +13215,13 @@ static void flying_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27600,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27600, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -22920,11 +13251,7 @@ static void flying_rc_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x007C75E4 */
 static void flying_rc_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -22936,24 +13263,12 @@ static void flying_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17844,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17844, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -22961,37 +13276,15 @@ static void flying_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17845,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17845, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17847,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17847, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -22999,24 +13292,12 @@ static void flying_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17843,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17843, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -23028,18 +13309,8 @@ static void flying_rc_track_diag_left_bank_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17846,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17846, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -23053,9 +13324,7 @@ static void flying_rc_track_diag_left_bank_to_25_deg_down(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 break;
         }
@@ -23069,24 +13338,12 @@ static void flying_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27600,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27600, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -23094,24 +13351,12 @@ static void flying_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27601,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27601, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -23119,24 +13364,12 @@ static void flying_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27599,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27599, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -23144,25 +13377,13 @@ static void flying_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27602,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27602, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -23192,11 +13413,7 @@ static void flying_rc_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x007C75F4 */
 static void flying_rc_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -23208,24 +13425,12 @@ static void flying_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17839,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17839, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -23233,24 +13438,12 @@ static void flying_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17840,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17840, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -23258,37 +13451,15 @@ static void flying_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17838,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17838, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17842,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17842, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -23300,18 +13471,8 @@ static void flying_rc_track_diag_right_bank_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17841,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17841, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -23325,9 +13486,7 @@ static void flying_rc_track_diag_right_bank_to_25_deg_down(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 break;
         }
@@ -23341,24 +13500,12 @@ static void flying_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27596,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27596, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -23366,24 +13513,12 @@ static void flying_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27597,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27597, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -23391,24 +13526,12 @@ static void flying_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27595,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27595, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -23416,25 +13539,13 @@ static void flying_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27598,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27598, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -23464,11 +13575,7 @@ static void flying_rc_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x007C7604 */
 static void flying_rc_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -23480,24 +13587,12 @@ static void flying_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17854,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17854, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -23506,37 +13601,15 @@ static void flying_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17855,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17855, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17857,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17857, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -23545,24 +13618,12 @@ static void flying_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17853,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17853, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -23575,18 +13636,8 @@ static void flying_rc_track_diag_25_deg_down_to_left_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17856,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17856, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -23600,9 +13651,7 @@ static void flying_rc_track_diag_25_deg_down_to_left_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -23617,24 +13666,12 @@ static void flying_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27608,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27608, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -23643,24 +13680,12 @@ static void flying_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27609,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27609, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -23669,24 +13694,12 @@ static void flying_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27607,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27607, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -23695,25 +13708,13 @@ static void flying_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27610,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27610, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -23743,11 +13744,7 @@ static void flying_rc_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x007C7614 */
 static void flying_rc_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -23759,24 +13756,12 @@ static void flying_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17849,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17849, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -23785,24 +13770,12 @@ static void flying_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17850,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17850, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -23811,37 +13784,15 @@ static void flying_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17848,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17848, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17852,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17852, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -23854,18 +13805,8 @@ static void flying_rc_track_diag_25_deg_down_to_right_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17851,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17851, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -23879,9 +13820,7 @@ static void flying_rc_track_diag_25_deg_down_to_right_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -23896,24 +13835,12 @@ static void flying_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27604,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27604, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -23922,24 +13849,12 @@ static void flying_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27605,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27605, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -23948,24 +13863,12 @@ static void flying_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27603,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27603, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -23974,25 +13877,13 @@ static void flying_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27606,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27606, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -24022,11 +13913,7 @@ static void flying_rc_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x007C7544 */
 static void flying_rc_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -24038,24 +13925,12 @@ static void flying_rc_track_diag_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17827,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17827, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -24064,24 +13939,12 @@ static void flying_rc_track_diag_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17824,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17824, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -24090,24 +13953,12 @@ static void flying_rc_track_diag_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17826,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17826, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -24120,18 +13971,8 @@ static void flying_rc_track_diag_left_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17825,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17825, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -24145,9 +13986,7 @@ static void flying_rc_track_diag_left_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -24162,24 +14001,12 @@ static void flying_rc_track_diag_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27586,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27586, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -24188,24 +14015,12 @@ static void flying_rc_track_diag_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27583,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27583, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -24214,24 +14029,12 @@ static void flying_rc_track_diag_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27585,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27585, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -24240,26 +14043,15 @@ static void flying_rc_track_diag_left_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27584,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27584, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -24288,11 +14080,7 @@ static void flying_rc_track_diag_left_bank(
 
 /** rct2: 0x007C7554 */
 static void flying_rc_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -24304,24 +14092,12 @@ static void flying_rc_track_diag_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17825,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17825, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -24330,24 +14106,12 @@ static void flying_rc_track_diag_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17826,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17826, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -24356,24 +14120,12 @@ static void flying_rc_track_diag_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17824,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17824, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -24386,18 +14138,8 @@ static void flying_rc_track_diag_right_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17827,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17827, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -24411,9 +14153,7 @@ static void flying_rc_track_diag_right_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -24428,24 +14168,12 @@ static void flying_rc_track_diag_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27584,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27584, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -24454,24 +14182,12 @@ static void flying_rc_track_diag_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27585,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27585, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -24480,24 +14196,12 @@ static void flying_rc_track_diag_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27583,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27583, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -24506,26 +14210,15 @@ static void flying_rc_track_diag_right_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27586,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27586, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -24554,11 +14247,7 @@ static void flying_rc_track_diag_right_bank(
 
 /** rct2: 0x007C7624 */
 static void flying_rc_track_left_flyer_twist_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -24593,8 +14282,7 @@ static void flying_rc_track_left_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -24602,17 +14290,7 @@ static void flying_rc_track_left_flyer_twist_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27431,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27431, 0, 6, 32, 20, 3, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 1:
@@ -24632,8 +14310,7 @@ static void flying_rc_track_left_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -24641,17 +14318,7 @@ static void flying_rc_track_left_flyer_twist_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27432,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27432, 0, 6, 32, 20, 3, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 1:
@@ -24672,8 +14339,7 @@ static void flying_rc_track_left_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -24693,11 +14359,7 @@ static void flying_rc_track_left_flyer_twist_up(
 
 /** rct2: 0x007C7634 */
 static void flying_rc_track_right_flyer_twist_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -24732,8 +14394,7 @@ static void flying_rc_track_right_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -24760,8 +14421,7 @@ static void flying_rc_track_right_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -24789,8 +14449,7 @@ static void flying_rc_track_right_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -24810,11 +14469,7 @@ static void flying_rc_track_right_flyer_twist_up(
 
 /** rct2: 0x007C7644 */
 static void flying_rc_track_left_flyer_twist_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -24832,17 +14487,7 @@ static void flying_rc_track_left_flyer_twist_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27432,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27432, 0, 6, 32, 20, 3, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 3:
@@ -24855,8 +14500,7 @@ static void flying_rc_track_left_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -24879,17 +14523,7 @@ static void flying_rc_track_left_flyer_twist_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27431,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27431, 0, 6, 32, 20, 3, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 3:
@@ -24901,8 +14535,7 @@ static void flying_rc_track_left_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -24940,8 +14573,7 @@ static void flying_rc_track_left_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -24949,11 +14581,7 @@ static void flying_rc_track_left_flyer_twist_down(
 
 /** rct2: 0x007C7654 */
 static void flying_rc_track_right_flyer_twist_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -24983,8 +14611,7 @@ static void flying_rc_track_right_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -25018,8 +14645,7 @@ static void flying_rc_track_right_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -25057,8 +14683,7 @@ static void flying_rc_track_right_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -25066,11 +14691,7 @@ static void flying_rc_track_right_flyer_twist_down(
 
 /** rct2: 0x007C72F4 */
 static void flying_rc_track_flyer_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -25116,34 +14737,14 @@ static void flying_rc_track_flyer_half_loop_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17635,
-                        0,
-                        14,
-                        3,
-                        20,
-                        63,
-                        height,
-                        28,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17635, 0, 14, 3, 20, 63, height, 28, 6,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES_INVERTED, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17632,
-                        0,
-                        6,
-                        3,
-                        20,
-                        63,
-                        height,
-                        28,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17632, 0, 6, 3, 20, 63, height, 28, 6,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -25167,17 +14768,7 @@ static void flying_rc_track_flyer_half_loop_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17636,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17636, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 2:
@@ -25186,17 +14777,7 @@ static void flying_rc_track_flyer_half_loop_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17639,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        15,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17639, 16, 16, 2, 16, 119, height, 15, 6,
                         height);
                     break;
             }
@@ -25204,8 +14785,7 @@ static void flying_rc_track_flyer_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 168, 0x20);
             break;
         case 3:
@@ -25241,11 +14821,7 @@ static void flying_rc_track_flyer_half_loop_up(
 
 /** rct2: 0x007C7304 */
 static void flying_rc_track_flyer_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -25287,17 +14863,7 @@ static void flying_rc_track_flyer_half_loop_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17636,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17636, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 2:
@@ -25306,17 +14872,7 @@ static void flying_rc_track_flyer_half_loop_down(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17639,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        15,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17639, 16, 16, 2, 16, 119, height, 15, 6,
                         height);
                     break;
             }
@@ -25324,8 +14880,7 @@ static void flying_rc_track_flyer_half_loop_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 168, 0x20);
             break;
         case 2:
@@ -25339,34 +14894,14 @@ static void flying_rc_track_flyer_half_loop_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17635,
-                        0,
-                        14,
-                        3,
-                        20,
-                        63,
-                        height,
-                        28,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17635, 0, 14, 3, 20, 63, height, 28, 6,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES_INVERTED, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17632,
-                        0,
-                        6,
-                        3,
-                        20,
-                        63,
-                        height,
-                        28,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17632, 0, 6, 3, 20, 63, height, 28, 6,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -25416,11 +14951,7 @@ static void flying_rc_track_flyer_half_loop_down(
 
 /** rct2: 0x007C7664 */
 static void flying_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -25452,33 +14983,13 @@ static void flying_rc_track_block_brakes(
             case 0:
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27337,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27337, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 1:
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27338,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27338, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
         }
@@ -25498,11 +15009,7 @@ static void flying_rc_track_block_brakes(
 
 /** rct2: 0x007C76B4 */
 static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -25518,17 +15025,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18027,
-                            0,
-                            6,
-                            32,
-                            1,
-                            34,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18027, 0, 6, 32, 1, 34, height, 0, 27,
                             height);
                         break;
                     case 2:
@@ -25547,9 +15044,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(
                     paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -25568,32 +15063,12 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18026,
-                            6,
-                            0,
-                            1,
-                            32,
-                            34,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18026, 6, 0, 1, 32, 34, height, 27, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18028,
-                            6,
-                            0,
-                            1,
-                            32,
-                            34,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18028, 6, 0, 1, 32, 34, height, 27, 0,
                             height);
                         break;
                     case 3:
@@ -25613,9 +15088,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -25649,8 +15122,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 47, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -25690,8 +15162,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 47, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -25712,11 +15183,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x007C76C4 */
 static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -25736,17 +15203,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18018,
-                            0,
-                            6,
-                            32,
-                            1,
-                            34,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18018, 0, 6, 32, 1, 34, height, 0, 27,
                             height);
                         break;
                     case 3:
@@ -25761,9 +15218,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(
                     paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -25784,34 +15239,14 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18017,
-                            6,
-                            0,
-                            1,
-                            32,
-                            34,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18017, 6, 0, 1, 32, 34, height, 27, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18019,
-                            6,
-                            0,
-                            1,
-                            32,
-                            34,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18019, 6, 0, 1, 32, 34, height, 27, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -25833,9 +15268,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -25869,8 +15302,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 47, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -25910,8 +15342,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 47, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -25932,11 +15363,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x007C76D4 */
 static void flying_rc_track_left_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -25946,11 +15373,7 @@ static void flying_rc_track_left_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x007C76E4 */
 static void flying_rc_track_right_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -25960,11 +15383,7 @@ static void flying_rc_track_right_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x007C76F4 */
 static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -25976,62 +15395,22 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17978,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17978, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17983,
-                            0,
-                            0,
-                            32,
-                            1,
-                            34,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17983, 0, 0, 32, 1, 34, height, 0, 27,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17988,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17988, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17993,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17993, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -26042,9 +15421,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -26060,47 +15437,17 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17984,
-                            0,
-                            0,
-                            1,
-                            1,
-                            34,
-                            height,
-                            30,
-                            30,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17984, 0, 0, 1, 1, 34, height, 30, 30,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17989,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17989, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17994,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17994, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -26108,8 +15455,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 3:
@@ -26117,47 +15463,17 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17980,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17980, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17985,
-                            0,
-                            0,
-                            1,
-                            1,
-                            34,
-                            height,
-                            30,
-                            30,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17985, 0, 0, 1, 1, 34, height, 30, 30,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17990,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17990, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
@@ -26166,9 +15482,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 64, 0x20);
                 break;
@@ -26180,62 +15494,22 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17981,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17981, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17986,
-                            0,
-                            0,
-                            1,
-                            1,
-                            34,
-                            height,
-                            30,
-                            30,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17986, 0, 0, 1, 1, 34, height, 30, 30,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17991,
-                            0,
-                            0,
-                            1,
-                            32,
-                            34,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17991, 0, 0, 1, 32, 34, height, 27, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17996,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17996, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                 }
@@ -26243,8 +15517,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 6:
@@ -26252,62 +15525,22 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17982,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17982, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17987,
-                            0,
-                            0,
-                            1,
-                            32,
-                            34,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17987, 0, 0, 1, 32, 34, height, 27, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17992,
-                            0,
-                            0,
-                            1,
-                            32,
-                            34,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17992, 0, 0, 1, 32, 34, height, 27, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17997,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17997, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -26323,9 +15556,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -26359,8 +15590,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 49, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -26397,8 +15627,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 88, 0x20);
                 break;
             case 3:
@@ -26422,9 +15651,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 80, 0x20);
                 break;
@@ -26455,8 +15682,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 88, 0x20);
                 break;
             case 6:
@@ -26483,8 +15709,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 49, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -26505,11 +15730,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x007C7704 */
 static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -26521,62 +15742,22 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17958,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17958, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17963,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17963, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17968,
-                            0,
-                            0,
-                            32,
-                            1,
-                            34,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17968, 0, 0, 32, 1, 34, height, 0, 27,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17973,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17973, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -26587,9 +15768,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_7);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -26601,47 +15780,17 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17959,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17959, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17964,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17964, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17969,
-                            0,
-                            0,
-                            1,
-                            1,
-                            34,
-                            height,
-                            30,
-                            30,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17969, 0, 0, 1, 1, 34, height, 30, 30,
                             height);
                         break;
                     case 3:
@@ -26653,8 +15802,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 3:
@@ -26666,54 +15814,22 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17965,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17965, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17970,
-                            0,
-                            0,
-                            1,
-                            1,
-                            34,
-                            height,
-                            30,
-                            30,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17970, 0, 0, 1, 1, 34, height, 30, 30,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17975,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17975, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 64, 0x20);
                 break;
@@ -26725,62 +15841,22 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17961,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17961, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17966,
-                            0,
-                            0,
-                            1,
-                            32,
-                            34,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17966, 0, 0, 1, 32, 34, height, 27, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17971,
-                            0,
-                            0,
-                            1,
-                            1,
-                            34,
-                            height,
-                            30,
-                            30,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17971, 0, 0, 1, 1, 34, height, 30, 30,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17976,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17976, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                 }
@@ -26788,8 +15864,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 6:
@@ -26797,62 +15872,22 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17962,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17962, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17967,
-                            0,
-                            0,
-                            1,
-                            32,
-                            34,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17967, 0, 0, 1, 32, 34, height, 27, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17972,
-                            0,
-                            0,
-                            1,
-                            32,
-                            34,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17972, 0, 0, 1, 32, 34, height, 27, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 17977,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 17977, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -26868,9 +15903,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -26904,8 +15937,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 49, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -26942,8 +15974,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 88, 0x20);
                 break;
             case 3:
@@ -26967,9 +15998,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 80, 0x20);
                 break;
@@ -27000,8 +16029,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 88, 0x20);
                 break;
             case 6:
@@ -27028,8 +16056,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 49, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -27050,11 +16077,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x007C7714 */
 static void flying_rc_track_left_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -27064,11 +16087,7 @@ static void flying_rc_track_left_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x007C7724 */
 static void flying_rc_track_right_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -27078,11 +16097,7 @@ static void flying_rc_track_right_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x007C7734 */
 static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -27131,62 +16146,22 @@ static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27719,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27719, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27720,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27720, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27721,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27721, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27722,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27722, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
         }
@@ -27230,11 +16205,7 @@ static void flying_rc_track_25_deg_up_to_left_banked_25_deg_up(
 
 /** rct2: 0x007C7744 */
 static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -27283,62 +16254,22 @@ static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27723,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27723, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27724,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27724, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27725,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27725, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27726,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27726, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
         }
@@ -27382,11 +16313,7 @@ static void flying_rc_track_25_deg_up_to_right_banked_25_deg_up(
 
 /** rct2: 0x007C7754 */
 static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -27435,62 +16362,22 @@ static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27727,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27727, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27728,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27728, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27729,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27729, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27730,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27730, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
         }
@@ -27534,11 +16421,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x007C7764 */
 static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -27587,62 +16470,22 @@ static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27731,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27731, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27732,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27732, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27733,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27733, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27734,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27734, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
         }
@@ -27686,11 +16529,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x007C7774 */
 static void flying_rc_track_25_deg_down_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_right_banked_25_deg_up_to_25_deg_up(
@@ -27699,11 +16538,7 @@ static void flying_rc_track_25_deg_down_to_left_banked_25_deg_down(
 
 /** rct2: 0x007C7784 */
 static void flying_rc_track_25_deg_down_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_left_banked_25_deg_up_to_25_deg_up(
@@ -27712,11 +16547,7 @@ static void flying_rc_track_25_deg_down_to_right_banked_25_deg_down(
 
 /** rct2: 0x007C7794 */
 static void flying_rc_track_left_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_25_deg_up_to_right_banked_25_deg_up(
@@ -27725,11 +16556,7 @@ static void flying_rc_track_left_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x007C77A4 */
 static void flying_rc_track_right_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_25_deg_up_to_left_banked_25_deg_up(
@@ -27738,11 +16565,7 @@ static void flying_rc_track_right_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x007C77B4 */
 static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -27789,62 +16612,22 @@ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27735,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27735, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27736,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27736, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27737,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27737, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27738,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27738, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -27888,11 +16671,7 @@ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x007C77C4 */
 static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -27939,62 +16718,22 @@ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27739,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27739, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27740,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27740, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27741,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27741, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27742,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27742, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -28038,11 +16777,7 @@ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x007C77F4 */
 static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -28089,62 +16824,22 @@ static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27743,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27743, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27744,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27744, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27745,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27745, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27746,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27746, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -28188,11 +16883,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(
 
 /** rct2: 0x007C7804 */
 static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -28239,62 +16930,22 @@ static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27747,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27747, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27748,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27748, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27749,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27749, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27750,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27750, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -28338,11 +16989,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(
 
 /** rct2: 0x007C7814 */
 static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_right_banked_25_deg_up_to_right_banked_flat(
@@ -28351,11 +16998,7 @@ static void flying_rc_track_left_banked_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x007C7824 */
 static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_left_banked_25_deg_up_to_left_banked_flat(
@@ -28364,11 +17007,7 @@ static void flying_rc_track_right_banked_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x007C77D4 */
 static void flying_rc_track_left_banked_25_deg_down_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_right_banked_flat_to_right_banked_25_deg_up(
@@ -28377,11 +17016,7 @@ static void flying_rc_track_left_banked_25_deg_down_to_left_banked_flat(
 
 /** rct2: 0x007C77E4 */
 static void flying_rc_track_right_banked_25_deg_down_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_left_banked_flat_to_left_banked_25_deg_up(
@@ -28390,11 +17025,7 @@ static void flying_rc_track_right_banked_25_deg_down_to_right_banked_flat(
 
 /** rct2: 0x007C7834 */
 static void flying_rc_track_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -28443,62 +17074,22 @@ static void flying_rc_track_flat_to_left_banked_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27695,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27695, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27696,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27696, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27697,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27697, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27698,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27698, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -28542,11 +17133,7 @@ static void flying_rc_track_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x007C7844 */
 static void flying_rc_track_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -28595,62 +17182,22 @@ static void flying_rc_track_flat_to_right_banked_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27699,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27699, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27700,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27700, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27701,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27701, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27702,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27702, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -28694,11 +17241,7 @@ static void flying_rc_track_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x007C7854 */
 static void flying_rc_track_left_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -28747,62 +17290,22 @@ static void flying_rc_track_left_banked_25_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27703,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27703, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27704,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27704, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27705,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27705, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27706,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27706, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -28846,11 +17349,7 @@ static void flying_rc_track_left_banked_25_deg_up_to_flat(
 
 /** rct2: 0x007C7864 */
 static void flying_rc_track_right_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -28899,62 +17398,22 @@ static void flying_rc_track_right_banked_25_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27707,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27707, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27708,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27708, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27709,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27709, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27710,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27710, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -28998,11 +17457,7 @@ static void flying_rc_track_right_banked_25_deg_up_to_flat(
 
 /** rct2: 0x007C7874 */
 static void flying_rc_track_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -29010,11 +17465,7 @@ static void flying_rc_track_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x007C7884 */
 static void flying_rc_track_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -29022,11 +17473,7 @@ static void flying_rc_track_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x007C7894 */
 static void flying_rc_track_left_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -29034,11 +17481,7 @@ static void flying_rc_track_left_banked_25_deg_down_to_flat(
 
 /** rct2: 0x007C78A4 */
 static void flying_rc_track_right_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     flying_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
diff --git a/src/openrct2/ride/coaster/GigaCoaster.cpp b/src/openrct2/ride/coaster/GigaCoaster.cpp
index cab2f1020b..ecf13ba98a 100644
--- a/src/openrct2/ride/coaster/GigaCoaster.cpp
+++ b/src/openrct2/ride/coaster/GigaCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x008AD674 */
 static void giga_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_cable_lift(tileElement))
@@ -101,11 +97,7 @@ static void giga_rc_track_flat(
 }
 
 static void giga_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -118,33 +110,13 @@ static void giga_rc_track_station(
     if (track_element_get_type(tileElement) == TRACK_ELEM_END_STATION)
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            1,
-            height,
-            0,
-            6,
+            session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
             height + 3);
     }
     else
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            1,
-            height,
-            0,
-            6,
+            session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
             height + 3);
     }
     sub_98196C_rotated(
@@ -158,11 +130,7 @@ static void giga_rc_track_station(
 
 /** rct2: 0x008AD684 */
 static void giga_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_cable_lift(tileElement))
@@ -258,11 +226,7 @@ static void giga_rc_track_25_deg_up(
 
 /** rct2: 0x008AD694 */
 static void giga_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_cable_lift(tileElement))
@@ -332,11 +296,7 @@ static void giga_rc_track_60_deg_up(
 
 /** rct2: 0x008AD6A4 */
 static void giga_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_cable_lift(tileElement))
@@ -432,11 +392,7 @@ static void giga_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x008AD6B4 */
 static void giga_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_cable_lift(tileElement))
@@ -514,11 +470,7 @@ static void giga_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008AD6C4 */
 static void giga_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_cable_lift(tileElement))
@@ -596,11 +548,7 @@ static void giga_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008AD6D4 */
 static void giga_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_cable_lift(tileElement))
@@ -696,11 +644,7 @@ static void giga_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x008AD6E4 */
 static void giga_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -708,11 +652,7 @@ static void giga_rc_track_25_deg_down(
 
 /** rct2: 0x008AD6F4 */
 static void giga_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -720,11 +660,7 @@ static void giga_rc_track_60_deg_down(
 
 /** rct2: 0x008AD704 */
 static void giga_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -732,11 +668,7 @@ static void giga_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008AD714 */
 static void giga_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -744,11 +676,7 @@ static void giga_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008AD724 */
 static void giga_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -756,11 +684,7 @@ static void giga_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008AD734 */
 static void giga_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -768,11 +692,7 @@ static void giga_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x008AD744 */
 static void giga_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -822,32 +742,12 @@ static void giga_rc_track_left_quarter_turn_5(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18198,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18198, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18183,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18183, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -855,8 +755,7 @@ static void giga_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -864,47 +763,17 @@ static void giga_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18187,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18187, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18192,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18192, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18197,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18197, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -924,17 +793,7 @@ static void giga_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18186,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18186, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -947,17 +806,7 @@ static void giga_rc_track_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18181,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18181, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -965,8 +814,7 @@ static void giga_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -1008,11 +856,7 @@ static void giga_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x008AD754 */
 static void giga_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1021,11 +865,7 @@ static void giga_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x008AD764 */
 static void giga_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1063,11 +903,7 @@ static void giga_rc_track_flat_to_left_bank(
 
 /** rct2: 0x008AD774 */
 static void giga_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1105,11 +941,7 @@ static void giga_rc_track_flat_to_right_bank(
 
 /** rct2: 0x008AD784 */
 static void giga_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1147,11 +979,7 @@ static void giga_rc_track_left_bank_to_flat(
 
 /** rct2: 0x008AD794 */
 static void giga_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1189,11 +1017,7 @@ static void giga_rc_track_right_bank_to_flat(
 
 /** rct2: 0x008AD7A4 */
 static void giga_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1205,32 +1029,12 @@ static void giga_rc_track_banked_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18209, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18220,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18220, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18214,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18214, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -1263,47 +1067,17 @@ static void giga_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18213,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18213, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18218,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18218, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18203,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18203, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -1311,8 +1085,7 @@ static void giga_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -1320,47 +1093,17 @@ static void giga_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18207,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18207, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18212,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18212, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18217,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18217, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -1380,32 +1123,12 @@ static void giga_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18206,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18206, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18211,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18211, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -1414,17 +1137,7 @@ static void giga_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18201,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18201, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -1432,8 +1145,7 @@ static void giga_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -1445,34 +1157,14 @@ static void giga_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18210,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18210, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18215, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18221,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18221, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -1499,11 +1191,7 @@ static void giga_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x008AD7B4 */
 static void giga_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1512,11 +1200,7 @@ static void giga_rc_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x008AD7C4 */
 static void giga_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1561,11 +1245,7 @@ static void giga_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x008AD7D4 */
 static void giga_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1610,11 +1290,7 @@ static void giga_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x008AD7E4 */
 static void giga_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1659,11 +1335,7 @@ static void giga_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x008AD7F4 */
 static void giga_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1708,11 +1380,7 @@ static void giga_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x008AD804 */
 static void giga_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1720,11 +1388,7 @@ static void giga_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x008AD814 */
 static void giga_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1732,11 +1396,7 @@ static void giga_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x008AD824 */
 static void giga_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1744,11 +1404,7 @@ static void giga_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x008AD834 */
 static void giga_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1756,11 +1412,7 @@ static void giga_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x008AD844 */
 static void giga_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1794,11 +1446,7 @@ static void giga_rc_track_left_bank(
 
 /** rct2: 0x008AD854 */
 static void giga_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1806,11 +1454,7 @@ static void giga_rc_track_right_bank(
 
 /** rct2: 0x008AD864 */
 static void giga_rc_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1860,32 +1504,12 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18285,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18285, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18290,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18290, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -1893,8 +1517,7 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -1902,47 +1525,17 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18276,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18276, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18281,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18281, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18286,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18286, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -1962,17 +1555,7 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18277,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18277, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -1985,17 +1568,7 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18292,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18292, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -2003,8 +1576,7 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -2046,11 +1618,7 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008AD874 */
 static void giga_rc_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2092,32 +1660,12 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18255,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18255, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18260,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18260, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -2133,8 +1681,7 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -2146,47 +1693,17 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18261,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18261, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18266,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18266, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18271,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18271, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -2202,17 +1719,7 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18257,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18257, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -2225,17 +1732,7 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18272,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18272, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -2243,8 +1740,7 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -2286,11 +1782,7 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008AD884 */
 static void giga_rc_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2299,11 +1791,7 @@ static void giga_rc_track_left_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008AD894 */
 static void giga_rc_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2312,11 +1800,7 @@ static void giga_rc_track_right_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008AD8A4 */
 static void giga_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2378,8 +1862,7 @@ static void giga_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2410,8 +1893,7 @@ static void giga_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2453,11 +1935,7 @@ static void giga_rc_track_s_bend_left(
 
 /** rct2: 0x008AD8B4 */
 static void giga_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2519,8 +1997,7 @@ static void giga_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2551,8 +2028,7 @@ static void giga_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2594,11 +2070,7 @@ static void giga_rc_track_s_bend_right(
 
 /** rct2: 0x008AD8F4 */
 static void giga_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2640,17 +2112,7 @@ static void giga_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18158,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18158, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -2659,32 +2121,12 @@ static void giga_rc_track_left_quarter_turn_3(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18164,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18164, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18155,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18155, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -2731,11 +2173,7 @@ static void giga_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x008AD904 */
 static void giga_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -2744,11 +2182,7 @@ static void giga_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x008AD914 */
 static void giga_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2760,32 +2194,12 @@ static void giga_rc_track_left_quarter_turn_3_bank(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18171, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18178,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18178, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18174,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18174, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -2814,62 +2228,22 @@ static void giga_rc_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18170,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18170, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18173,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18173, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18176,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18176, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18167,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18167, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -2886,34 +2260,14 @@ static void giga_rc_track_left_quarter_turn_3_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18172,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18172, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18175, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18179,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18179, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -2940,11 +2294,7 @@ static void giga_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x008AD924 */
 static void giga_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -2953,11 +2303,7 @@ static void giga_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x008AD934 */
 static void giga_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3036,11 +2382,7 @@ static void giga_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008AD944 */
 static void giga_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3126,11 +2468,7 @@ static void giga_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008AD954 */
 static void giga_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3139,11 +2477,7 @@ static void giga_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008AD964 */
 static void giga_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3152,11 +2486,7 @@ static void giga_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008AD974 */
 static void giga_rc_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3168,32 +2498,12 @@ static void giga_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18329, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18336,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18336, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18332,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18332, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -3211,10 +2521,8 @@ static void giga_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -3225,62 +2533,22 @@ static void giga_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18328,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18328, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18331,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18331, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18334,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18334, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18325,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18325, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -3297,34 +2565,14 @@ static void giga_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18330,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18330, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18333, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18337,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18337, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -3343,10 +2591,8 @@ static void giga_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -3360,32 +2606,12 @@ static void giga_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18329, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18336,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18336, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18332,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18332, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -3404,10 +2630,8 @@ static void giga_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -3418,62 +2642,22 @@ static void giga_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18325,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18325, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18328,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18328, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18331,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18331, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18334,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18334, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -3494,34 +2678,14 @@ static void giga_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18330,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18330, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18333, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18337,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18337, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -3531,10 +2695,8 @@ static void giga_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -3542,11 +2704,7 @@ static void giga_rc_track_left_half_banked_helix_up_small(
 
 /** rct2: 0x008AD984 */
 static void giga_rc_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3564,34 +2722,14 @@ static void giga_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18316,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18316, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18319, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18323,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18323, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -3601,10 +2739,8 @@ static void giga_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -3615,62 +2751,22 @@ static void giga_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18311,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18311, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18314,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18314, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18317,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18317, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18320,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18320, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -3689,32 +2785,12 @@ static void giga_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18315, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18322,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18322, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18318,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18318, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -3733,10 +2809,8 @@ static void giga_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -3748,34 +2822,14 @@ static void giga_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18316,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18316, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18319, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18323,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18323, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -3794,10 +2848,8 @@ static void giga_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -3808,62 +2860,22 @@ static void giga_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18314,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18314, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18317,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18317, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18320,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18320, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18311,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18311, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -3878,32 +2890,12 @@ static void giga_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18315, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18322,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18322, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18318,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18318, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -3921,10 +2913,8 @@ static void giga_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -3932,11 +2922,7 @@ static void giga_rc_track_right_half_banked_helix_up_small(
 
 /** rct2: 0x008AD994 */
 static void giga_rc_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -3950,11 +2936,7 @@ static void giga_rc_track_left_half_banked_helix_down_small(
 
 /** rct2: 0x008AD9A4 */
 static void giga_rc_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -3968,11 +2950,7 @@ static void giga_rc_track_right_half_banked_helix_down_small(
 
 /** rct2: 0x008AD9B4 */
 static void giga_rc_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3984,32 +2962,12 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18369, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18380,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18380, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18374,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18374, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -4027,10 +2985,8 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -4045,47 +3001,17 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18373,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18373, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18378,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18378, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18363,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18363, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -4093,8 +3019,7 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -4102,47 +3027,17 @@ static void giga_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18367,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18367, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18372,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18372, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18377,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18377, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -4162,32 +3057,12 @@ static void giga_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18366,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18366, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18371,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18371, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -4196,17 +3071,7 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18361,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18361, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4214,8 +3079,7 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -4227,34 +3091,14 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18370,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18370, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18375, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18381,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18381, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4273,10 +3117,8 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -4290,32 +3132,12 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18369, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18380,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18380, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18374,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18374, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4334,10 +3156,8 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -4348,17 +3168,7 @@ static void giga_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18363,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18363, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -4367,32 +3177,12 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18373,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18373, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18378,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18378, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4400,8 +3190,7 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -4413,47 +3202,17 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18367,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18367, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18372,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18372, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18377,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18377, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -4469,47 +3228,17 @@ static void giga_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18361,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18361, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18366,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18366, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18371,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18371, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -4521,8 +3250,7 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -4538,34 +3266,14 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18370,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18370, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18375, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18381,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18381, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -4575,10 +3283,8 @@ static void giga_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -4586,11 +3292,7 @@ static void giga_rc_track_left_half_banked_helix_up_large(
 
 /** rct2: 0x008AD9C4 */
 static void giga_rc_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4608,34 +3310,14 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18348,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18348, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18353, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18359,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18359, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -4645,10 +3327,8 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -4659,47 +3339,17 @@ static void giga_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18339,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18339, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18344,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18344, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18349,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18349, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -4711,8 +3361,7 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -4724,47 +3373,17 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18345,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18345, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18350,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18350, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18355,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18355, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -4780,17 +3399,7 @@ static void giga_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18341,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18341, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -4799,32 +3408,12 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18351,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18351, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18356,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18356, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4832,8 +3421,7 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -4849,34 +3437,14 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18347, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18358,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18358, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 4, 3, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18352,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18352, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4898,10 +3466,8 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -4913,34 +3479,14 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18348,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18348, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18353, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18359,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18359, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4959,10 +3505,8 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -4973,32 +3517,12 @@ static void giga_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18344,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18344, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18349,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18349, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -5007,17 +3531,7 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18339,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18339, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -5025,8 +3539,7 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -5034,47 +3547,17 @@ static void giga_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18345,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18345, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18350,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18350, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18355,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18355, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -5098,47 +3581,17 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18351,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18351, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18356,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18356, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18341,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18341, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5146,8 +3599,7 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -5157,34 +3609,14 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18347, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18358,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18358, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 4, 3, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18352,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18352, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5207,10 +3639,8 @@ static void giga_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -5218,11 +3648,7 @@ static void giga_rc_track_right_half_banked_helix_up_large(
 
 /** rct2: 0x008AD9D4 */
 static void giga_rc_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -5236,11 +3662,7 @@ static void giga_rc_track_left_half_banked_helix_down_large(
 
 /** rct2: 0x008AD9E4 */
 static void giga_rc_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -5254,11 +3676,7 @@ static void giga_rc_track_right_half_banked_helix_down_large(
 
 /** rct2: 0x008ADA14 */
 static void giga_rc_track_left_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -5295,11 +3713,7 @@ static void giga_rc_track_left_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008AD9F4 */
 static void giga_rc_track_right_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -5336,11 +3750,7 @@ static void giga_rc_track_right_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008ADA04 */
 static void giga_rc_track_left_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement);
@@ -5348,11 +3758,7 @@ static void giga_rc_track_left_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008ADA24 */
 static void giga_rc_track_right_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement);
@@ -5360,11 +3766,7 @@ static void giga_rc_track_right_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008ADA34 */
 static void giga_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -5396,11 +3798,7 @@ static void giga_rc_track_brakes(
 
 /** rct2: 0x008ADC84 */
 static void giga_rc_track_25_deg_up_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -5441,11 +3839,7 @@ static void giga_rc_track_25_deg_up_left_banked(
 
 /** rct2: 0x008ADC94 */
 static void giga_rc_track_25_deg_up_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -5486,11 +3880,7 @@ static void giga_rc_track_25_deg_up_right_banked(
 
 /** rct2: 0x008ADA44 */
 static void giga_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -5532,11 +3922,7 @@ static void giga_rc_track_on_ride_photo(
 
 /** rct2: 0x008ADCA4 */
 static void giga_rc_track_25_deg_down_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -5544,11 +3930,7 @@ static void giga_rc_track_25_deg_down_left_banked(
 
 /** rct2: 0x008ADCB4 */
 static void giga_rc_track_25_deg_down_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -5556,11 +3938,7 @@ static void giga_rc_track_25_deg_down_right_banked(
 
 /** rct2: 0x008ADED4 */
 static void giga_rc_track_flat_to_60_deg_up_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5572,62 +3950,22 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18722,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18722, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18726,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18726, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18730,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18730, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18734,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18734, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -5643,62 +3981,22 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18660,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18660, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18664,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18664, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18668,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18668, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18672,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18672, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -5723,62 +4021,22 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18723,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18723, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18727,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18727, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18731,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18731, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18735,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18735, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -5794,62 +4052,22 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18661,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18661, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18665,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18665, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18669,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18669, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18673,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18673, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -5870,62 +4088,22 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18724,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18724, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18728,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18728, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18732,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18732, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18736,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18736, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -5941,62 +4119,22 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18662,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18662, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18666,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18666, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18670,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18670, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18674,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18674, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -6017,62 +4155,22 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18725,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18725, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18729,
-                            0,
-                            0,
-                            32,
-                            1,
-                            98,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18729, 0, 0, 32, 1, 98, height, 0, 27,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18733,
-                            0,
-                            0,
-                            32,
-                            1,
-                            98,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18733, 0, 0, 32, 1, 98, height, 0, 27,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18737,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18737, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -6088,62 +4186,22 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18663,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18663, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18667,
-                            0,
-                            0,
-                            32,
-                            1,
-                            98,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18667, 0, 0, 32, 1, 98, height, 0, 27,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18671,
-                            0,
-                            0,
-                            32,
-                            1,
-                            98,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18671, 0, 0, 32, 1, 98, height, 0, 27,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18675,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18675, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -6171,11 +4229,7 @@ static void giga_rc_track_flat_to_60_deg_up_long_base(
 
 /** rct2: 0x008ADEE4 */
 static void giga_rc_track_60_deg_up_to_flat_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6189,32 +4243,12 @@ static void giga_rc_track_60_deg_up_to_flat_long_base(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18680,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18680, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18684,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18684, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -6336,11 +4370,7 @@ static void giga_rc_track_60_deg_up_to_flat_long_base(
 
 /** rct2: 0x008ADEF4 */
 static void giga_rc_track_flat_to_60_deg_down_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_flat_to_60_deg_up_long_base(session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, tileElement);
@@ -6348,11 +4378,7 @@ static void giga_rc_track_flat_to_60_deg_down_long_base(
 
 /** rct2: 0x008ADF04 */
 static void giga_rc_track_60_deg_up_to_flat_long_base122(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_60_deg_up_to_flat_long_base(session, rideIndex, 3 - trackSequence, (direction + 2) & 3, height, tileElement);
@@ -6360,11 +4386,7 @@ static void giga_rc_track_60_deg_up_to_flat_long_base122(
 
 /** rct2: 0x008ADF14 */
 static void giga_rc_track_cable_lift_hill(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6450,17 +4472,7 @@ static void giga_rc_track_cable_lift_hill(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18714, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18717,
-                        0,
-                        0,
-                        32,
-                        1,
-                        66,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18717, 0, 0, 32, 1, 66, height, 0, 27,
                         height);
                     break;
                 case 1:
@@ -6475,17 +4487,7 @@ static void giga_rc_track_cable_lift_hill(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18713, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18716,
-                        0,
-                        0,
-                        32,
-                        1,
-                        66,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18716, 0, 0, 32, 1, 66, height, 0, 27,
                         height);
                     break;
             }
@@ -6511,17 +4513,7 @@ static void giga_rc_track_cable_lift_hill(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18720,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18720, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 1:
@@ -6534,17 +4526,7 @@ static void giga_rc_track_cable_lift_hill(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18719,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18719, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
             }
@@ -6570,11 +4552,7 @@ static void giga_rc_track_cable_lift_hill(
 
 /** rct2: 0x008ADA64 */
 static void giga_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6621,32 +4599,12 @@ static void giga_rc_track_left_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18423,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18423, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18427,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18427, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -6654,8 +4612,7 @@ static void giga_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -6663,47 +4620,17 @@ static void giga_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18416,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18416, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18420,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18420, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18424,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18424, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -6712,10 +4639,8 @@ static void giga_rc_track_left_eighth_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -6728,34 +4653,14 @@ static void giga_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18417,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18417, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18421,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18421, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6768,17 +4673,7 @@ static void giga_rc_track_left_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18429,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18429, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6788,8 +4683,7 @@ static void giga_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -6797,11 +4691,7 @@ static void giga_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x008ADA74 */
 static void giga_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6840,32 +4730,12 @@ static void giga_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18399,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18399, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18403,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18403, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -6881,8 +4751,7 @@ static void giga_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -6894,17 +4763,7 @@ static void giga_rc_track_right_eighth_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18404,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18404, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
@@ -6913,25 +4772,13 @@ static void giga_rc_track_right_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18412,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18412, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -6944,17 +4791,7 @@ static void giga_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18401,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18401, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6967,34 +4804,14 @@ static void giga_rc_track_right_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18409,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18409, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18413,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18413, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7004,8 +4821,7 @@ static void giga_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -7013,11 +4829,7 @@ static void giga_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x008ADA84 */
 static void giga_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -7026,11 +4838,7 @@ static void giga_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008ADA94 */
 static void giga_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -7039,11 +4847,7 @@ static void giga_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008ADAA4 */
 static void giga_rc_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7053,32 +4857,12 @@ static void giga_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18446,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18446, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18450,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18450, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -7108,47 +4892,17 @@ static void giga_rc_track_left_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18451,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18451, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18455,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18455, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18459,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18459, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -7156,8 +4910,7 @@ static void giga_rc_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -7165,47 +4918,17 @@ static void giga_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18448,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18448, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18452,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18452, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18456,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18456, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -7214,10 +4937,8 @@ static void giga_rc_track_left_eighth_bank_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -7230,34 +4951,14 @@ static void giga_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18449,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18449, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18453,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18453, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7270,17 +4971,7 @@ static void giga_rc_track_left_eighth_bank_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18461,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18461, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7290,8 +4981,7 @@ static void giga_rc_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -7299,11 +4989,7 @@ static void giga_rc_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x008ADAB4 */
 static void giga_rc_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7321,32 +5007,12 @@ static void giga_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18438,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18438, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18442,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18442, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -7364,47 +5030,17 @@ static void giga_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18431,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18431, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18435,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18435, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18439,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18439, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -7416,8 +5052,7 @@ static void giga_rc_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -7429,55 +5064,23 @@ static void giga_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18436,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18436, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18440,
-                        0,
-                        0,
-                        28,
-                        28,
-                        0,
-                        height,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18440, 0, 0, 28, 28, 0, height, 4, 4,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18444,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18444, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -7490,17 +5093,7 @@ static void giga_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18433,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18433, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7513,34 +5106,14 @@ static void giga_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18441,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18441, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18445,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18445, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7550,8 +5123,7 @@ static void giga_rc_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -7559,11 +5131,7 @@ static void giga_rc_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x008ADAC4 */
 static void giga_rc_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -7572,11 +5140,7 @@ static void giga_rc_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008ADAD4 */
 static void giga_rc_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -7585,11 +5149,7 @@ static void giga_rc_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008ADA54 */
 static void giga_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7601,18 +5161,8 @@ static void giga_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18527,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18527, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7622,18 +5172,8 @@ static void giga_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18465,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18465, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7648,18 +5188,8 @@ static void giga_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18524,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18524, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7669,18 +5199,8 @@ static void giga_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18462,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18462, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7695,18 +5215,8 @@ static void giga_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18526,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18526, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7716,18 +5226,8 @@ static void giga_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18464,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18464, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7746,18 +5246,8 @@ static void giga_rc_track_diag_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18525,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18525, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7781,18 +5271,8 @@ static void giga_rc_track_diag_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18463,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18463, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7815,11 +5295,7 @@ static void giga_rc_track_diag_flat(
 
 /** rct2: 0x008ADB04 */
 static void giga_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7831,18 +5307,8 @@ static void giga_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18539,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18539, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7852,18 +5318,8 @@ static void giga_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18477,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18477, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7878,18 +5334,8 @@ static void giga_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18536,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18536, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7899,18 +5345,8 @@ static void giga_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18474,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18474, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7925,18 +5361,8 @@ static void giga_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18538,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18538, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7946,18 +5372,8 @@ static void giga_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18476,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18476, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7976,18 +5392,8 @@ static void giga_rc_track_diag_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18537,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18537, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8011,18 +5417,8 @@ static void giga_rc_track_diag_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18475,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18475, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8045,11 +5441,7 @@ static void giga_rc_track_diag_25_deg_up(
 
 /** rct2: 0x008ADB64 */
 static void giga_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8059,17 +5451,7 @@ static void giga_rc_track_diag_60_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18489,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18489, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8082,17 +5464,7 @@ static void giga_rc_track_diag_60_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18486,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18486, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8105,17 +5477,7 @@ static void giga_rc_track_diag_60_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18488,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18488, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8132,17 +5494,7 @@ static void giga_rc_track_diag_60_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18487,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18487, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 36, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8165,11 +5517,7 @@ static void giga_rc_track_diag_60_deg_up(
 
 /** rct2: 0x008ADAE4 */
 static void giga_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8181,18 +5529,8 @@ static void giga_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18531,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18531, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8202,18 +5540,8 @@ static void giga_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18469,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18469, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8228,18 +5556,8 @@ static void giga_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18528,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18528, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8249,18 +5567,8 @@ static void giga_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18466,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18466, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8275,18 +5583,8 @@ static void giga_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18530,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18530, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8296,18 +5594,8 @@ static void giga_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18468,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18468, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8326,18 +5614,8 @@ static void giga_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18529,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18529, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8361,18 +5639,8 @@ static void giga_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18467,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18467, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8395,11 +5663,7 @@ static void giga_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008ADB44 */
 static void giga_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8409,17 +5673,7 @@ static void giga_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18481,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18481, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8432,17 +5686,7 @@ static void giga_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18478,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18478, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8455,17 +5699,7 @@ static void giga_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18480,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18480, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8482,17 +5716,7 @@ static void giga_rc_track_diag_25_deg_up_to_60_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18479,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18479, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8515,11 +5739,7 @@ static void giga_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008ADB54 */
 static void giga_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8529,17 +5749,7 @@ static void giga_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18485,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18485, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8552,17 +5762,7 @@ static void giga_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18482,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18482, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8575,17 +5775,7 @@ static void giga_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18484,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18484, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8602,17 +5792,7 @@ static void giga_rc_track_diag_60_deg_up_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18483,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18483, -16, -16, 16, 16, 3, height, 0, 0,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 21, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8635,11 +5815,7 @@ static void giga_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008ADAF4 */
 static void giga_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8651,18 +5827,8 @@ static void giga_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18535,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18535, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8672,18 +5838,8 @@ static void giga_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18473,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18473, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8698,18 +5854,8 @@ static void giga_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18532,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18532, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8719,18 +5865,8 @@ static void giga_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18470,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18470, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8745,18 +5881,8 @@ static void giga_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18534,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18534, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8766,18 +5892,8 @@ static void giga_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18472,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18472, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8796,18 +5912,8 @@ static void giga_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18533,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18533, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8831,18 +5937,8 @@ static void giga_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18471,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18471, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8865,11 +5961,7 @@ static void giga_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008ADB34 */
 static void giga_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8881,18 +5973,8 @@ static void giga_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18537,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18537, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8902,18 +5984,8 @@ static void giga_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18475,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18475, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8928,18 +6000,8 @@ static void giga_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18538,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18538, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8949,18 +6011,8 @@ static void giga_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18476,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18476, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8975,18 +6027,8 @@ static void giga_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18536,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18536, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8996,18 +6038,8 @@ static void giga_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18474,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18474, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9026,18 +6058,8 @@ static void giga_rc_track_diag_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18539,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18539, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9061,18 +6083,8 @@ static void giga_rc_track_diag_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18477,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18477, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9095,11 +6107,7 @@ static void giga_rc_track_diag_25_deg_down(
 
 /** rct2: 0x008ADB94 */
 static void giga_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9109,17 +6117,7 @@ static void giga_rc_track_diag_60_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18487,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18487, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9132,17 +6130,7 @@ static void giga_rc_track_diag_60_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18488,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18488, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9155,17 +6143,7 @@ static void giga_rc_track_diag_60_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18486,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18486, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9182,17 +6160,7 @@ static void giga_rc_track_diag_60_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18489,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18489, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 28, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -9215,11 +6183,7 @@ static void giga_rc_track_diag_60_deg_down(
 
 /** rct2: 0x008ADB14 */
 static void giga_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9231,18 +6195,8 @@ static void giga_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18533,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18533, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9252,18 +6206,8 @@ static void giga_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18471,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18471, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9277,18 +6221,8 @@ static void giga_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18534,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18534, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9298,18 +6232,8 @@ static void giga_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18472,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18472, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9323,18 +6247,8 @@ static void giga_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18532,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18532, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9344,18 +6258,8 @@ static void giga_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18470,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18470, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9373,18 +6277,8 @@ static void giga_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18535,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18535, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9408,18 +6302,8 @@ static void giga_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18473,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18473, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9443,11 +6327,7 @@ static void giga_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008ADB74 */
 static void giga_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9457,17 +6337,7 @@ static void giga_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18483,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18483, -16, -16, 16, 16, 3, height, 0, 0,
                         height);
                     break;
             }
@@ -9480,17 +6350,7 @@ static void giga_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18484,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18484, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9503,17 +6363,7 @@ static void giga_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18482,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18482, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9530,17 +6380,7 @@ static void giga_rc_track_diag_25_deg_down_to_60_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18485,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18485, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 17, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -9563,11 +6403,7 @@ static void giga_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008ADB84 */
 static void giga_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9577,17 +6413,7 @@ static void giga_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18479,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18479, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9600,17 +6426,7 @@ static void giga_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18480,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18480, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9623,17 +6439,7 @@ static void giga_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18478,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18478, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9650,17 +6456,7 @@ static void giga_rc_track_diag_60_deg_down_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18481,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18481, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -9683,11 +6479,7 @@ static void giga_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008ADB24 */
 static void giga_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9699,18 +6491,8 @@ static void giga_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18529,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18529, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9720,18 +6502,8 @@ static void giga_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18467,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18467, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9746,18 +6518,8 @@ static void giga_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18530,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18530, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9767,18 +6529,8 @@ static void giga_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18468,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18468, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9793,18 +6545,8 @@ static void giga_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18528,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18528, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9814,18 +6556,8 @@ static void giga_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18466,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18466, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9844,18 +6576,8 @@ static void giga_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18531,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18531, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9879,18 +6601,8 @@ static void giga_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 18469,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 18469, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9913,11 +6625,7 @@ static void giga_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x008ADBC4 */
 static void giga_rc_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9927,17 +6635,7 @@ static void giga_rc_track_diag_flat_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18497,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18497, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9950,30 +6648,10 @@ static void giga_rc_track_diag_flat_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18494,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18494, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18498,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18498, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -9986,17 +6664,7 @@ static void giga_rc_track_diag_flat_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18496,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18496, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10013,17 +6681,7 @@ static void giga_rc_track_diag_flat_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18495,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18495, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10046,11 +6704,7 @@ static void giga_rc_track_diag_flat_to_left_bank(
 
 /** rct2: 0x008ADBD4 */
 static void giga_rc_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10060,17 +6714,7 @@ static void giga_rc_track_diag_flat_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18502,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18502, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10083,17 +6727,7 @@ static void giga_rc_track_diag_flat_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18499,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18499, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10106,30 +6740,10 @@ static void giga_rc_track_diag_flat_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18501,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18501, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18503,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18503, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -10146,17 +6760,7 @@ static void giga_rc_track_diag_flat_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18500,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18500, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10179,11 +6783,7 @@ static void giga_rc_track_diag_flat_to_right_bank(
 
 /** rct2: 0x008ADBE4 */
 static void giga_rc_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10193,17 +6793,7 @@ static void giga_rc_track_diag_left_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18500,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18500, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10216,30 +6806,10 @@ static void giga_rc_track_diag_left_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18501,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18501, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18503,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18503, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -10252,17 +6822,7 @@ static void giga_rc_track_diag_left_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18499,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18499, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10279,17 +6839,7 @@ static void giga_rc_track_diag_left_bank_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18502,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18502, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10312,11 +6862,7 @@ static void giga_rc_track_diag_left_bank_to_flat(
 
 /** rct2: 0x008ADBF4 */
 static void giga_rc_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10326,17 +6872,7 @@ static void giga_rc_track_diag_right_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18495,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18495, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10349,17 +6885,7 @@ static void giga_rc_track_diag_right_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18496,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18496, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10372,30 +6898,10 @@ static void giga_rc_track_diag_right_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18494,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18494, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18498,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18498, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -10412,17 +6918,7 @@ static void giga_rc_track_diag_right_bank_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18497,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18497, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10445,11 +6941,7 @@ static void giga_rc_track_diag_right_bank_to_flat(
 
 /** rct2: 0x008ADC24 */
 static void giga_rc_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10459,17 +6951,7 @@ static void giga_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18517,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18517, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10482,30 +6964,10 @@ static void giga_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18514,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18514, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18518,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18518, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -10518,17 +6980,7 @@ static void giga_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18516,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18516, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10545,17 +6997,7 @@ static void giga_rc_track_diag_left_bank_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18515,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18515, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10578,11 +7020,7 @@ static void giga_rc_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x008ADC34 */
 static void giga_rc_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10592,17 +7030,7 @@ static void giga_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18522,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18522, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10615,17 +7043,7 @@ static void giga_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18519,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18519, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10638,30 +7056,10 @@ static void giga_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18521,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18521, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18523,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18523, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -10678,17 +7076,7 @@ static void giga_rc_track_diag_right_bank_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18520,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18520, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10711,11 +7099,7 @@ static void giga_rc_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x008ADC04 */
 static void giga_rc_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10725,17 +7109,7 @@ static void giga_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18507,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18507, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10748,30 +7122,10 @@ static void giga_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18504,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18504, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18508,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18508, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -10784,17 +7138,7 @@ static void giga_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18506,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18506, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10811,17 +7155,7 @@ static void giga_rc_track_diag_25_deg_up_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18505,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18505, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10844,11 +7178,7 @@ static void giga_rc_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x008ADC14 */
 static void giga_rc_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10858,17 +7188,7 @@ static void giga_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18512,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18512, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10881,17 +7201,7 @@ static void giga_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18509,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18509, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10904,30 +7214,10 @@ static void giga_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18511,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18511, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18513,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18513, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -10944,17 +7234,7 @@ static void giga_rc_track_diag_25_deg_up_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18510,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18510, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10977,11 +7257,7 @@ static void giga_rc_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x008ADC44 */
 static void giga_rc_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10991,17 +7267,7 @@ static void giga_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18510,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18510, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11013,30 +7279,10 @@ static void giga_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18511,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18511, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18513,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18513, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11048,17 +7294,7 @@ static void giga_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18509,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18509, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11074,17 +7310,7 @@ static void giga_rc_track_diag_left_bank_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18512,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18512, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11108,11 +7334,7 @@ static void giga_rc_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x008ADC54 */
 static void giga_rc_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11122,17 +7344,7 @@ static void giga_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18505,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18505, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11144,17 +7356,7 @@ static void giga_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18506,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18506, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11166,30 +7368,10 @@ static void giga_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18504,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18504, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18508,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18508, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11205,17 +7387,7 @@ static void giga_rc_track_diag_right_bank_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18507,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18507, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11239,11 +7411,7 @@ static void giga_rc_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x008ADC64 */
 static void giga_rc_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11253,17 +7421,7 @@ static void giga_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18520,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18520, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11276,30 +7434,10 @@ static void giga_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18521,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18521, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18523,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18523, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11312,17 +7450,7 @@ static void giga_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18519,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18519, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11339,17 +7467,7 @@ static void giga_rc_track_diag_25_deg_down_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18522,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18522, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11372,11 +7490,7 @@ static void giga_rc_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x008ADC74 */
 static void giga_rc_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11386,17 +7500,7 @@ static void giga_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18515,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18515, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11409,17 +7513,7 @@ static void giga_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18516,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18516, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11432,30 +7526,10 @@ static void giga_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18514,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18514, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18518,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18518, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11472,17 +7546,7 @@ static void giga_rc_track_diag_25_deg_down_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18517,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18517, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11505,11 +7569,7 @@ static void giga_rc_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x008ADBA4 */
 static void giga_rc_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11519,17 +7579,7 @@ static void giga_rc_track_diag_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18493,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18493, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11542,17 +7592,7 @@ static void giga_rc_track_diag_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18490,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18490, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -11565,17 +7605,7 @@ static void giga_rc_track_diag_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18492,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18492, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11592,17 +7622,7 @@ static void giga_rc_track_diag_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18491,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18491, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11625,11 +7645,7 @@ static void giga_rc_track_diag_left_bank(
 
 /** rct2: 0x008ADBB4 */
 static void giga_rc_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11639,17 +7655,7 @@ static void giga_rc_track_diag_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18491,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18491, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11662,17 +7668,7 @@ static void giga_rc_track_diag_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18492,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18492, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11685,17 +7681,7 @@ static void giga_rc_track_diag_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18490,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18490, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -11712,17 +7698,7 @@ static void giga_rc_track_diag_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18493,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18493, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11745,11 +7721,7 @@ static void giga_rc_track_diag_right_bank(
 
 /** rct2: 0x008ADEC4 */
 static void giga_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -11781,11 +7753,7 @@ static void giga_rc_track_block_brakes(
 
 /** rct2: 0x008ADCC4 */
 static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11799,17 +7767,7 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18657,
-                        0,
-                        6,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18657, 0, 6, 32, 1, 34, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -11845,32 +7803,12 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18656,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18656, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18658,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18658, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -11897,11 +7835,7 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008ADCD4 */
 static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11919,17 +7853,7 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18648,
-                        0,
-                        6,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18648, 0, 6, 32, 1, 34, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -11963,34 +7887,14 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18647,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18647, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18649,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18649, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12020,11 +7924,7 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008ADCE4 */
 static void giga_rc_track_left_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -12034,11 +7934,7 @@ static void giga_rc_track_left_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008ADCF4 */
 static void giga_rc_track_right_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -12048,11 +7944,7 @@ static void giga_rc_track_right_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008ADD04 */
 static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12066,17 +7958,7 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18629,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18629, 0, 0, 32, 1, 34, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -12109,47 +7991,17 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18630,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18630, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18635,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18635, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18640,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18640, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -12157,8 +8009,7 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -12166,47 +8017,17 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18626,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18626, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18631,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18631, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18636,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18636, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -12226,62 +8047,22 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18627,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18627, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18632,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18632, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18637,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18637, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18642,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18642, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -12289,8 +8070,7 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -12302,32 +8082,12 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18633,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18633, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18638,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18638, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -12354,11 +8114,7 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008ADD14 */
 static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12376,17 +8132,7 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18614,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18614, 0, 0, 32, 1, 34, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -12411,47 +8157,17 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18605,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18605, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18610,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18610, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18615,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18615, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 3:
@@ -12463,8 +8179,7 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -12476,47 +8191,17 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18611,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18611, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18616,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18616, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18621,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18621, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -12532,62 +8217,22 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18607,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18607, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18612,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18612, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18617,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18617, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18622,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18622, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -12595,8 +8240,7 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -12608,32 +8252,12 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18613,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18613, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18618,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18618, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -12660,11 +8284,7 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008ADD24 */
 static void giga_rc_track_left_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -12674,11 +8294,7 @@ static void giga_rc_track_left_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008ADD34 */
 static void giga_rc_track_right_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -12688,11 +8304,7 @@ static void giga_rc_track_right_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008ADD44 */
 static void giga_rc_track_25_deg_up_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12735,11 +8347,7 @@ static void giga_rc_track_25_deg_up_to_left_banked_25_deg_up(
 
 /** rct2: 0x008ADD54 */
 static void giga_rc_track_25_deg_up_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12782,11 +8390,7 @@ static void giga_rc_track_25_deg_up_to_right_banked_25_deg_up(
 
 /** rct2: 0x008ADD64 */
 static void giga_rc_track_left_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12829,11 +8433,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x008ADD74 */
 static void giga_rc_track_right_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12876,11 +8476,7 @@ static void giga_rc_track_right_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x008ADD84 */
 static void giga_rc_track_25_deg_down_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_right_banked_25_deg_up_to_25_deg_up(
@@ -12889,11 +8485,7 @@ static void giga_rc_track_25_deg_down_to_left_banked_25_deg_down(
 
 /** rct2: 0x008ADD94 */
 static void giga_rc_track_25_deg_down_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_left_banked_25_deg_up_to_25_deg_up(
@@ -12902,11 +8494,7 @@ static void giga_rc_track_25_deg_down_to_right_banked_25_deg_down(
 
 /** rct2: 0x008ADDA4 */
 static void giga_rc_track_left_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_25_deg_up_to_right_banked_25_deg_up(
@@ -12915,11 +8503,7 @@ static void giga_rc_track_left_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x008ADDB4 */
 static void giga_rc_track_right_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_25_deg_up_to_left_banked_25_deg_up(
@@ -12928,11 +8512,7 @@ static void giga_rc_track_right_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x008ADDC4 */
 static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12973,11 +8553,7 @@ static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x008ADDD4 */
 static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13018,11 +8594,7 @@ static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x008ADE04 */
 static void giga_rc_track_left_banked_25_deg_up_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13063,11 +8635,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_left_banked_flat(
 
 /** rct2: 0x008ADE14 */
 static void giga_rc_track_right_banked_25_deg_up_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13108,11 +8676,7 @@ static void giga_rc_track_right_banked_25_deg_up_to_right_banked_flat(
 
 /** rct2: 0x008ADE24 */
 static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_right_banked_25_deg_up_to_right_banked_flat(
@@ -13121,11 +8685,7 @@ static void giga_rc_track_left_banked_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x008ADE34 */
 static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_left_banked_25_deg_up_to_left_banked_flat(
@@ -13134,11 +8694,7 @@ static void giga_rc_track_right_banked_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x008ADDE4 */
 static void giga_rc_track_left_banked_25_deg_down_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_right_banked_flat_to_right_banked_25_deg_up(
@@ -13147,11 +8703,7 @@ static void giga_rc_track_left_banked_25_deg_down_to_left_banked_flat(
 
 /** rct2: 0x008ADDF4 */
 static void giga_rc_track_right_banked_25_deg_down_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_left_banked_flat_to_left_banked_25_deg_up(
@@ -13160,11 +8712,7 @@ static void giga_rc_track_right_banked_25_deg_down_to_right_banked_flat(
 
 /** rct2: 0x008ADE44 */
 static void giga_rc_track_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13207,11 +8755,7 @@ static void giga_rc_track_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x008ADE54 */
 static void giga_rc_track_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13254,11 +8798,7 @@ static void giga_rc_track_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x008ADE64 */
 static void giga_rc_track_left_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13301,11 +8841,7 @@ static void giga_rc_track_left_banked_25_deg_up_to_flat(
 
 /** rct2: 0x008ADE74 */
 static void giga_rc_track_right_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13348,11 +8884,7 @@ static void giga_rc_track_right_banked_25_deg_up_to_flat(
 
 /** rct2: 0x008ADE84 */
 static void giga_rc_track_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -13360,11 +8892,7 @@ static void giga_rc_track_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x008ADE94 */
 static void giga_rc_track_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -13372,11 +8900,7 @@ static void giga_rc_track_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x008ADEA4 */
 static void giga_rc_track_left_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -13384,22 +8908,14 @@ static void giga_rc_track_left_banked_25_deg_down_to_flat(
 
 /** rct2: 0x008ADEB4 */
 static void giga_rc_track_right_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     giga_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void giga_rc_track_booster(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     // These offsets could be moved to the g2.dat file when that supports offsets.
@@ -13413,34 +8929,14 @@ static void giga_rc_track_booster(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | SPR_G2_GIGA_RC_BOOSTER_NE_SW,
-                ne_sw_offsetX,
-                ne_sw_offsetY,
-                32,
-                20,
-                3,
-                height,
-                0,
-                6,
-                height);
+                session, direction, session->TrackColours[SCHEME_TRACK] | SPR_G2_GIGA_RC_BOOSTER_NE_SW, ne_sw_offsetX,
+                ne_sw_offsetY, 32, 20, 3, height, 0, 6, height);
             break;
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | SPR_G2_GIGA_RC_BOOSTER_NW_SE,
-                nw_se_offsetX,
-                nw_se_offsetY,
-                32,
-                20,
-                3,
-                height,
-                0,
-                6,
-                height);
+                session, direction, session->TrackColours[SCHEME_TRACK] | SPR_G2_GIGA_RC_BOOSTER_NW_SE, nw_se_offsetX,
+                nw_se_offsetY, 32, 20, 3, height, 0, 6, height);
             break;
     }
     if (track_paint_util_should_paint_supports(session->MapPosition))
diff --git a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp
index 9c5e73e8ff..250c4fdb4c 100644
--- a/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp
+++ b/src/openrct2/ride/coaster/HeartlineTwisterCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x0087694C */
 static void heartline_twister_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -90,11 +86,7 @@ static void heartline_twister_rc_track_flat(
 }
 
 static void heartline_twister_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -105,17 +97,7 @@ static void heartline_twister_rc_track_station(
     };
 
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-        0,
-        0,
-        32,
-        20,
-        1,
-        height,
-        0,
-        6,
+        session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
         height + 3);
     sub_98196C_rotated(
         session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
@@ -128,11 +110,7 @@ static void heartline_twister_rc_track_station(
 
 /** rct2: 0x0087695C */
 static void heartline_twister_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -217,11 +195,7 @@ static void heartline_twister_rc_track_25_deg_up(
 
 /** rct2: 0x008769FC */
 static void heartline_twister_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -306,11 +280,7 @@ static void heartline_twister_rc_track_60_deg_up(
 
 /** rct2: 0x0087696C */
 static void heartline_twister_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -395,11 +365,7 @@ static void heartline_twister_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x008769BC */
 static void heartline_twister_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -484,11 +450,7 @@ static void heartline_twister_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008769CC */
 static void heartline_twister_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -573,11 +535,7 @@ static void heartline_twister_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x0087697C */
 static void heartline_twister_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -662,11 +620,7 @@ static void heartline_twister_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x0087698C */
 static void heartline_twister_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     heartline_twister_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -674,11 +628,7 @@ static void heartline_twister_rc_track_25_deg_down(
 
 /** rct2: 0x00876A0C */
 static void heartline_twister_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     heartline_twister_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -686,11 +636,7 @@ static void heartline_twister_rc_track_60_deg_down(
 
 /** rct2: 0x0087699C */
 static void heartline_twister_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     heartline_twister_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -698,11 +644,7 @@ static void heartline_twister_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008769DC */
 static void heartline_twister_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     heartline_twister_rc_track_60_deg_up_to_25_deg_up(
@@ -711,11 +653,7 @@ static void heartline_twister_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008769EC */
 static void heartline_twister_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     heartline_twister_rc_track_25_deg_up_to_60_deg_up(
@@ -724,11 +662,7 @@ static void heartline_twister_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008769AC */
 static void heartline_twister_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     heartline_twister_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -736,11 +670,7 @@ static void heartline_twister_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x00876A6C */
 static void heartline_twister_rc_track_heartline_transfer_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -752,17 +682,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21306, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21310,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21310, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 23);
                     wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -770,17 +690,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21307, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21311,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21311, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 23);
                     wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -788,17 +698,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21308, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21312,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21312, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 23);
                     wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -806,17 +706,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21309, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21313,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21313, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 23);
                     wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -837,221 +727,61 @@ static void heartline_twister_rc_track_heartline_transfer_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21314,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21314, 0, 0, 32, 20, 2, height + 8, 0, 6,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21308,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 16,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21308, 0, 0, 32, 20, 2, height + 16, 0, 6,
                         height + 16);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21318,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21318, 0, 0, 32, 1, 34, height + 8, 0, 27,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21312,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 16,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21312, 0, 0, 32, 1, 34, height + 16, 0, 27,
                         height + 16);
                     wooden_a_supports_paint_setup(session, 6, 5, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21315,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21315, 0, 0, 32, 20, 2, height + 8, 0, 6,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21309,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 16,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21309, 0, 0, 32, 20, 2, height + 16, 0, 6,
                         height + 16);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21319,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21319, 0, 0, 32, 1, 34, height + 8, 0, 27,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21313,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 16,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21313, 0, 0, 32, 1, 34, height + 16, 0, 27,
                         height + 16);
                     wooden_a_supports_paint_setup(session, 7, 6, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21316,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21316, 0, 0, 32, 20, 2, height + 8, 0, 6,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21306,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 16,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21306, 0, 0, 32, 20, 2, height + 16, 0, 6,
                         height + 16);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21320,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21320, 0, 0, 32, 1, 34, height + 8, 0, 27,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21310,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 16,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21310, 0, 0, 32, 1, 34, height + 16, 0, 27,
                         height + 16);
                     wooden_a_supports_paint_setup(session, 6, 7, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21317,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21317, 0, 0, 32, 20, 2, height + 8, 0, 6,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21307,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 16,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21307, 0, 0, 32, 20, 2, height + 16, 0, 6,
                         height + 16);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21321,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21321, 0, 0, 32, 1, 34, height + 8, 0, 27,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21311,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 16,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21311, 0, 0, 32, 1, 34, height + 16, 0, 27,
                         height + 16);
                     wooden_a_supports_paint_setup(session, 7, 8, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1066,17 +796,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21298, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21302,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21302, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1084,17 +804,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21299, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21303,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21303, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1102,17 +812,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21300, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21304,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21304, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1120,17 +820,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21301, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21305,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21305, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1143,114 +833,34 @@ static void heartline_twister_rc_track_heartline_transfer_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21316,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height - 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21316, 0, 0, 32, 20, 2, height - 8, 0, 6,
                         height - 7);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21320,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height - 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21320, 0, 0, 32, 1, 34, height - 8, 0, 27,
                         height - 8);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21317,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height - 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21317, 0, 0, 32, 20, 2, height - 8, 0, 6,
                         height - 7);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21321,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height - 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21321, 0, 0, 32, 1, 34, height - 8, 0, 27,
                         height - 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21314,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height - 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21314, 0, 0, 32, 20, 2, height - 8, 0, 6,
                         height - 7);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21318,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height - 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21318, 0, 0, 32, 1, 34, height - 8, 0, 27,
                         height - 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21315,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height - 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21315, 0, 0, 32, 20, 2, height - 8, 0, 6,
                         height - 7);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21319,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height - 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21319, 0, 0, 32, 1, 34, height - 8, 0, 27,
                         height - 8);
                     break;
             }
@@ -1270,11 +880,7 @@ static void heartline_twister_rc_track_heartline_transfer_up(
 
 /** rct2: 0x00876A7C */
 static void heartline_twister_rc_track_heartline_transfer_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1284,114 +890,34 @@ static void heartline_twister_rc_track_heartline_transfer_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21316,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height - 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21316, 0, 0, 32, 20, 2, height - 8, 0, 6,
                         height - 7);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21320,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height - 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21320, 0, 0, 32, 1, 34, height - 8, 0, 27,
                         height - 8);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21317,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height - 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21317, 0, 0, 32, 20, 2, height - 8, 0, 6,
                         height - 7);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21321,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height - 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21321, 0, 0, 32, 1, 34, height - 8, 0, 27,
                         height - 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21314,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height - 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21314, 0, 0, 32, 20, 2, height - 8, 0, 6,
                         height - 7);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21318,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height - 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21318, 0, 0, 32, 1, 34, height - 8, 0, 27,
                         height - 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21315,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height - 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21315, 0, 0, 32, 20, 2, height - 8, 0, 6,
                         height - 7);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21319,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height - 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21319, 0, 0, 32, 1, 34, height - 8, 0, 27,
                         height - 8);
                     break;
             }
@@ -1411,221 +937,61 @@ static void heartline_twister_rc_track_heartline_transfer_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21314,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21314, 0, 0, 32, 20, 2, height + 8, 0, 6,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21308,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 16,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21308, 0, 0, 32, 20, 2, height + 16, 0, 6,
                         height + 16);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21318,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21318, 0, 0, 32, 1, 34, height + 8, 0, 27,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21312,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 16,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21312, 0, 0, 32, 1, 34, height + 16, 0, 27,
                         height + 16);
                     wooden_a_supports_paint_setup(session, 6, 5, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21315,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21315, 0, 0, 32, 20, 2, height + 8, 0, 6,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21309,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 16,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21309, 0, 0, 32, 20, 2, height + 16, 0, 6,
                         height + 16);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21319,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21319, 0, 0, 32, 1, 34, height + 8, 0, 27,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21313,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 16,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21313, 0, 0, 32, 1, 34, height + 16, 0, 27,
                         height + 16);
                     wooden_a_supports_paint_setup(session, 7, 6, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21316,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21316, 0, 0, 32, 20, 2, height + 8, 0, 6,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21306,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 16,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21306, 0, 0, 32, 20, 2, height + 16, 0, 6,
                         height + 16);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21320,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21320, 0, 0, 32, 1, 34, height + 8, 0, 27,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21310,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 16,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21310, 0, 0, 32, 1, 34, height + 16, 0, 27,
                         height + 16);
                     wooden_a_supports_paint_setup(session, 6, 7, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21317,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 8,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21317, 0, 0, 32, 20, 2, height + 8, 0, 6,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21307,
-                        0,
-                        0,
-                        32,
-                        20,
-                        2,
-                        height + 16,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21307, 0, 0, 32, 20, 2, height + 16, 0, 6,
                         height + 16);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21321,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 8,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21321, 0, 0, 32, 1, 34, height + 8, 0, 27,
                         height + 8);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21311,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height + 16,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21311, 0, 0, 32, 1, 34, height + 16, 0, 27,
                         height + 16);
                     wooden_a_supports_paint_setup(session, 7, 8, height + 8, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1640,17 +1006,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21298, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21302,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21302, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1658,17 +1014,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21299, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21303,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21303, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1676,17 +1022,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21300, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21304,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21304, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1694,17 +1030,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21301, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21305,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21305, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1719,17 +1045,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21306, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21310,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21310, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 23);
                     wooden_a_supports_paint_setup(session, 6, 1, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1737,17 +1053,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21307, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21311,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21311, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 23);
                     wooden_a_supports_paint_setup(session, 7, 2, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1755,17 +1061,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21308, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21312,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21312, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 23);
                     wooden_a_supports_paint_setup(session, 6, 3, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1773,17 +1069,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21309, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21313,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21313, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 23);
                     wooden_a_supports_paint_setup(session, 7, 4, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1804,11 +1090,7 @@ static void heartline_twister_rc_track_heartline_transfer_down(
 
 /** rct2: 0x00876A4C */
 static void heartline_twister_rc_track_left_heartline_roll(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1820,17 +1102,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21410, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21422,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21422, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1838,17 +1110,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21413, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21425,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21425, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1856,17 +1118,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21416, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21428,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21428, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1874,17 +1126,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21419, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21431,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21431, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1900,17 +1142,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21411, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21423,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21423, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1918,17 +1150,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21414, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21426,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21426, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1936,17 +1158,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21417, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21429,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21429, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1954,17 +1166,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21420, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21432,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21432, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1979,17 +1181,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21412, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21424,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21424, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1997,17 +1189,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21415, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21427,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21427, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2015,17 +1197,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21418, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21430,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21430, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2033,17 +1205,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21421, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21433,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21433, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2058,17 +1220,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21418, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21430,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21430, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2076,17 +1228,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21421, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21433,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21433, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2094,17 +1236,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21412, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21424,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21424, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2112,17 +1244,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21415, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21427,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21427, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2137,17 +1259,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21417, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21429,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21429, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2155,17 +1267,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21420, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21432,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21432, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2173,17 +1275,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21411, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21423,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21423, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2191,17 +1283,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21414, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21426,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21426, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2216,17 +1298,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21416, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21428,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21428, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2234,17 +1306,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21419, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21431,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21431, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2252,17 +1314,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21410, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21422,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21422, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2270,17 +1322,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21413, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21425,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21425, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2294,11 +1336,7 @@ static void heartline_twister_rc_track_left_heartline_roll(
 
 /** rct2: 0x00876A5C */
 static void heartline_twister_rc_track_right_heartline_roll(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2310,17 +1348,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21434, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21446,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21446, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2328,17 +1356,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21437, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21449,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21449, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2346,17 +1364,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21440, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21452,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21452, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2364,17 +1372,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21443, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21455,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21455, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2390,17 +1388,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21435, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21447,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21447, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2408,17 +1396,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21438, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21450,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21450, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2426,17 +1404,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21441, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21453,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21453, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2444,17 +1412,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21444, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21456,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21456, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2469,17 +1427,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21436, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21448,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21448, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2487,17 +1435,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21439, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21451,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21451, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2505,17 +1443,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21442, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21454,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21454, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2523,17 +1451,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21445, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21457,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21457, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2548,17 +1466,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21442, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21454,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21454, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2566,17 +1474,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21445, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21457,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21457, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2584,17 +1482,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21436, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21448,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21448, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2602,17 +1490,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21439, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21451,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21451, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2627,17 +1505,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21441, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21453,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21453, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2645,17 +1513,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21444, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21456,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21456, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2663,17 +1521,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21435, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21447,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21447, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2681,17 +1529,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21438, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21450,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21450, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2706,17 +1544,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21440, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21452,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21452, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2724,17 +1552,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21443, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21455,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21455, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2742,17 +1560,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21434, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21446,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21446, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2760,17 +1568,7 @@ static void heartline_twister_rc_track_right_heartline_roll(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21437, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21449,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21449, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
diff --git a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp
index 60fb474473..7e3a46bbcb 100644
--- a/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp
+++ b/src/openrct2/ride/coaster/InvertedHairpinCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x00890CB4 */
 static void inverted_hairpin_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -34,62 +30,22 @@ static void inverted_hairpin_rc_track_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17030,
-                    0,
-                    0,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17030, 0, 0, 32, 20, 1, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17031,
-                    0,
-                    0,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17031, 0, 0, 32, 20, 1, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17032,
-                    0,
-                    0,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17032, 0, 0, 32, 20, 1, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17033,
-                    0,
-                    0,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17033, 0, 0, 32, 20, 1, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -101,33 +57,13 @@ static void inverted_hairpin_rc_track_flat(
             case 0:
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17026,
-                    0,
-                    0,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17026, 0, 0, 32, 20, 1, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17027,
-                    0,
-                    0,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17027, 0, 0, 32, 20, 1, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -147,11 +83,7 @@ static void inverted_hairpin_rc_track_flat(
 
 /** rct2: 0x00890D84, 0x00890D94, 0x00890DA4 */
 static void inverted_hairpin_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -164,30 +96,10 @@ static void inverted_hairpin_rc_track_station(
     sub_98197C_rotated(
         session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height, 0, 2, height);
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-        0,
-        0,
-        32,
-        20,
-        3,
-        height + 24,
-        0,
-        6,
+        session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 3, height + 24, 0, 6,
         height + 24);
     sub_98199C_rotated(
-        session,
-        direction,
-        imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS],
-        0,
-        6,
-        32,
-        20,
-        1,
-        height + 24,
-        0,
-        6,
+        session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 1, height + 24, 0, 6,
         height + 24);
     track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 11);
     track_paint_util_draw_station_inverted(session, rideIndex, direction, height, tileElement, STATION_VARIANT_1);
@@ -198,11 +110,7 @@ static void inverted_hairpin_rc_track_station(
 
 /** rct2: 0x00890CC4 */
 static void inverted_hairpin_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -211,62 +119,22 @@ static void inverted_hairpin_rc_track_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17070,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17070, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17071,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17071, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17072,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17072, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17073,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17073, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
         }
@@ -277,62 +145,22 @@ static void inverted_hairpin_rc_track_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17042,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17042, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17043,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17043, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17044,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17044, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17045,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17045, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
         }
@@ -376,11 +204,7 @@ static void inverted_hairpin_rc_track_25_deg_up(
 
 /** rct2: 0x00890CD4 */
 static void inverted_hairpin_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -389,62 +213,22 @@ static void inverted_hairpin_rc_track_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17086,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17086, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 88);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17087,
-                    0,
-                    0,
-                    32,
-                    2,
-                    81,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17087, 0, 0, 32, 2, 81, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17088,
-                    0,
-                    0,
-                    32,
-                    2,
-                    81,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17088, 0, 0, 32, 2, 81, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17089,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17089, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 88);
                 break;
         }
@@ -455,62 +239,22 @@ static void inverted_hairpin_rc_track_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17058,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17058, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 88);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17059,
-                    0,
-                    0,
-                    32,
-                    2,
-                    81,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17059, 0, 0, 32, 2, 81, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17060,
-                    0,
-                    0,
-                    32,
-                    2,
-                    81,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17060, 0, 0, 32, 2, 81, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17061,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17061, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 88);
                 break;
         }
@@ -530,11 +274,7 @@ static void inverted_hairpin_rc_track_60_deg_up(
 
 /** rct2: 0x00890CE4 */
 static void inverted_hairpin_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -543,62 +283,22 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17062,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17062, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17063,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17063, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17064,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17064, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17065,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17065, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -609,62 +309,22 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17034,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17034, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17035,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17035, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17036,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17036, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17037,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17037, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -708,11 +368,7 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x00890CF4 */
 static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -721,88 +377,28 @@ static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17074,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17074, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17078,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17078, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17075,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17075, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17079,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17079, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17076,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17076, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17077,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17077, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
         }
@@ -813,88 +409,28 @@ static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17046,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17046, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17050,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17050, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17047,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17047, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17051,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17051, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17048,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17048, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17049,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17049, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
         }
@@ -914,11 +450,7 @@ static void inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x00890D04 */
 static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -927,88 +459,28 @@ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17080,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17080, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17084,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17084, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17081,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17081, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17085,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17085, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17082,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17082, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17083,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17083, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
         }
@@ -1019,88 +491,28 @@ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17052,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17052, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17056,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17056, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17053,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17053, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17057,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17057, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17054,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17054, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17055,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17055, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
         }
@@ -1144,11 +556,7 @@ static void inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x00890D14 */
 static void inverted_hairpin_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -1157,62 +565,22 @@ static void inverted_hairpin_rc_track_25_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17066,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17066, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17067,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17067, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17068,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17068, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17069,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17069, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -1223,62 +591,22 @@ static void inverted_hairpin_rc_track_25_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17038,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17038, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17039,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17039, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17040,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17040, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17041,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17041, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -1322,11 +650,7 @@ static void inverted_hairpin_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x00890D24 */
 static void inverted_hairpin_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_hairpin_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1334,11 +658,7 @@ static void inverted_hairpin_rc_track_25_deg_down(
 
 /** rct2: 0x00890D34 */
 static void inverted_hairpin_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_hairpin_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1346,11 +666,7 @@ static void inverted_hairpin_rc_track_60_deg_down(
 
 /** rct2: 0x00890D44 */
 static void inverted_hairpin_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_hairpin_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1358,11 +674,7 @@ static void inverted_hairpin_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x00890D54 */
 static void inverted_hairpin_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_hairpin_rc_track_60_deg_up_to_25_deg_up(
@@ -1371,11 +683,7 @@ static void inverted_hairpin_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x00890D64 */
 static void inverted_hairpin_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_hairpin_rc_track_25_deg_up_to_60_deg_up(
@@ -1384,11 +692,7 @@ static void inverted_hairpin_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x00890D74 */
 static void inverted_hairpin_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_hairpin_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1396,11 +700,7 @@ static void inverted_hairpin_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x00890DB4 */
 static void inverted_hairpin_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1410,71 +710,29 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17123,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17123, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 22);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17126,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17126, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 22);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17129,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17129, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 22);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17120,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17120, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 22);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1492,62 +750,22 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17122,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17122, 0, 0, 16, 16, 3, height + 24, 16, 0,
                         height + 22);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17125,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17125, 0, 0, 16, 16, 3, height + 24, 0, 0,
                         height + 22);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17128,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17128, 0, 0, 16, 16, 3, height + 24, 0, 16,
                         height + 22);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17119,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17119, 0, 0, 16, 16, 3, height + 24, 16, 16,
                         height + 22);
                     break;
             }
@@ -1560,71 +778,29 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17121,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17121, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 22);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17124,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17124, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 22);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17127,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17127, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 22);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 17118,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 17118, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 22);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 30, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1644,11 +820,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x00890DC4 */
 static void inverted_hairpin_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -1657,11 +829,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x00890DD4 */
 static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1688,10 +856,8 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1729,10 +895,8 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1752,11 +916,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x00890DE4 */
 static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1783,10 +943,8 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1824,10 +982,8 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 38, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1847,11 +1003,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x00890DF4 */
 static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -1861,11 +1013,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x00890E04 */
 static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -1875,73 +1023,29 @@ static void inverted_hairpin_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x00890E64 */
 static void inverted_hairpin_rc_track_left_quarter_turn_1(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 17114,
-                0,
-                0,
-                26,
-                24,
-                3,
-                height + 24,
-                6,
-                2,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 17114, 0, 0, 26, 24, 3, height + 24, 6, 2,
                 height + 24);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 17115,
-                0,
-                0,
-                26,
-                26,
-                3,
-                height + 24,
-                0,
-                0,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 17115, 0, 0, 26, 26, 3, height + 24, 0, 0,
                 height + 24);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 17116,
-                0,
-                0,
-                24,
-                26,
-                3,
-                height + 24,
-                2,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 17116, 0, 0, 24, 26, 3, height + 24, 2, 6,
                 height + 24);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 17117,
-                0,
-                0,
-                24,
-                24,
-                3,
-                height + 24,
-                6,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 17117, 0, 0, 24, 24, 3, height + 24, 6, 6,
                 height + 24);
             break;
     }
@@ -1969,11 +1073,7 @@ static void inverted_hairpin_rc_track_left_quarter_turn_1(
 
 /** rct2: 0x00890E74 */
 static void inverted_hairpin_rc_track_right_quarter_turn_1(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_hairpin_rc_track_left_quarter_turn_1(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement);
@@ -1981,11 +1081,7 @@ static void inverted_hairpin_rc_track_right_quarter_turn_1(
 
 /** rct2: 0x00890E24 */
 static void inverted_hairpin_rc_track_flat_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -1994,88 +1090,28 @@ static void inverted_hairpin_rc_track_flat_to_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17102,
-                    0,
-                    0,
-                    30,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17102, 0, 0, 30, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17106,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17106, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17103,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17103, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17107,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17107, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17104,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17104, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17105,
-                    0,
-                    0,
-                    30,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17105, 0, 0, 30, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
         }
@@ -2086,88 +1122,28 @@ static void inverted_hairpin_rc_track_flat_to_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17090,
-                    0,
-                    0,
-                    30,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17090, 0, 0, 30, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17094,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17094, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17091,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17091, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17095,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17095, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17092,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17092, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17093,
-                    0,
-                    0,
-                    30,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17093, 0, 0, 30, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
         }
@@ -2187,11 +1163,7 @@ static void inverted_hairpin_rc_track_flat_to_60_deg_up(
 
 /** rct2: 0x00890E34 */
 static void inverted_hairpin_rc_track_60_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -2200,88 +1172,28 @@ static void inverted_hairpin_rc_track_60_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17108,
-                    0,
-                    0,
-                    30,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17108, 0, 0, 30, 20, 3, height + 24, 0, 6,
                     height + 48);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17112,
-                    0,
-                    0,
-                    32,
-                    10,
-                    41,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17112, 0, 0, 32, 10, 41, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17109,
-                    0,
-                    0,
-                    32,
-                    2,
-                    41,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17109, 0, 0, 32, 2, 41, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17113,
-                    0,
-                    0,
-                    32,
-                    10,
-                    41,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17113, 0, 0, 32, 10, 41, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17110,
-                    0,
-                    0,
-                    32,
-                    2,
-                    41,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17110, 0, 0, 32, 2, 41, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17111,
-                    0,
-                    0,
-                    30,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17111, 0, 0, 30, 20, 3, height + 24, 0, 6,
                     height + 48);
                 break;
         }
@@ -2292,88 +1204,28 @@ static void inverted_hairpin_rc_track_60_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17096,
-                    0,
-                    0,
-                    30,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17096, 0, 0, 30, 20, 3, height + 24, 0, 6,
                     height + 48);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17100,
-                    0,
-                    0,
-                    32,
-                    10,
-                    41,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17100, 0, 0, 32, 10, 41, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17097,
-                    0,
-                    0,
-                    32,
-                    2,
-                    41,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17097, 0, 0, 32, 2, 41, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17101,
-                    0,
-                    0,
-                    32,
-                    10,
-                    41,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17101, 0, 0, 32, 10, 41, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17098,
-                    0,
-                    0,
-                    32,
-                    2,
-                    41,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17098, 0, 0, 32, 2, 41, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 17099,
-                    0,
-                    0,
-                    30,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 17099, 0, 0, 30, 20, 3, height + 24, 0, 6,
                     height + 48);
                 break;
         }
@@ -2414,11 +1266,7 @@ static void inverted_hairpin_rc_track_60_deg_up_to_flat(
 
 /** rct2: 0x00890E44 */
 static void inverted_hairpin_rc_track_flat_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_hairpin_rc_track_60_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -2426,11 +1274,7 @@ static void inverted_hairpin_rc_track_flat_to_60_deg_down(
 
 /** rct2: 0x00890E54 */
 static void inverted_hairpin_rc_track_60_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_hairpin_rc_track_flat_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -2438,11 +1282,7 @@ static void inverted_hairpin_rc_track_60_deg_down_to_flat(
 
 /** rct2: 0x00890E14 */
 static void inverted_hairpin_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -2450,33 +1290,13 @@ static void inverted_hairpin_rc_track_brakes(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 17028,
-                0,
-                0,
-                32,
-                20,
-                1,
-                height + 24,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 17028, 0, 0, 32, 20, 1, height + 24, 0, 6,
                 height + 22);
             break;
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 17029,
-                0,
-                0,
-                32,
-                20,
-                1,
-                height + 24,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 17029, 0, 0, 32, 20, 1, height + 24, 0, 6,
                 height + 22);
             break;
     }
@@ -2495,11 +1315,7 @@ static void inverted_hairpin_rc_track_brakes(
 
 /** rct2: 0x00890E84 */
 static void inverted_hairpin_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -2507,33 +1323,13 @@ static void inverted_hairpin_rc_track_block_brakes(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 17028,
-                0,
-                0,
-                32,
-                20,
-                1,
-                height + 24,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 17028, 0, 0, 32, 20, 1, height + 24, 0, 6,
                 height + 22);
             break;
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 17029,
-                0,
-                0,
-                32,
-                20,
-                1,
-                height + 24,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 17029, 0, 0, 32, 20, 1, height + 24, 0, 6,
                 height + 22);
             break;
     }
diff --git a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp
index 5150ddaf46..fa55b58660 100644
--- a/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp
+++ b/src/openrct2/ride/coaster/InvertedImpulseCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x008B0460 */
 static void inverted_impulse_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -33,33 +29,13 @@ static void inverted_impulse_rc_track_flat(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19662,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19662, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19663,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19663, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -78,11 +54,7 @@ static void inverted_impulse_rc_track_flat(
 
 /** rct2: 0x008B0470, 0x008B0480, 0x008B0490 */
 static void inverted_impulse_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -95,30 +67,10 @@ static void inverted_impulse_rc_track_station(
     sub_98197C_rotated(
         session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height, 0, 2, height);
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-        0,
-        0,
-        32,
-        20,
-        3,
-        height + 29,
-        0,
-        6,
+        session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 3, height + 29, 0, 6,
         height + 29);
     sub_98199C_rotated(
-        session,
-        direction,
-        imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS],
-        0,
-        6,
-        32,
-        20,
-        3,
-        height + 29,
-        0,
-        6,
+        session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 29, 0, 6,
         height + 29);
     track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 11);
     track_paint_util_draw_station_inverted(session, rideIndex, direction, height, tileElement, STATION_VARIANT_TALL);
@@ -129,73 +81,29 @@ static void inverted_impulse_rc_track_station(
 
 /** rct2: 0x008B04A0 */
 static void inverted_impulse_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19672,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19672, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19673,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19673, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19674,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19674, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19675,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19675, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
     }
@@ -238,73 +146,29 @@ static void inverted_impulse_rc_track_25_deg_up(
 
 /** rct2: 0x008B04B0 */
 static void inverted_impulse_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19688,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19688, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 93);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19689,
-                0,
-                0,
-                32,
-                2,
-                81,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19689, 0, 0, 32, 2, 81, height + 29, 0, 4,
                 height + 11);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19690,
-                0,
-                0,
-                32,
-                2,
-                81,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19690, 0, 0, 32, 2, 81, height + 29, 0, 4,
                 height + 11);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19691,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19691, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 93);
             break;
     }
@@ -323,73 +187,29 @@ static void inverted_impulse_rc_track_60_deg_up(
 
 /** rct2: 0x008B04C0 */
 static void inverted_impulse_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19664,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19664, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19665,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19665, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19666,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19666, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19667,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19667, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -429,99 +249,35 @@ static void inverted_impulse_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x008B04D0 */
 static void inverted_impulse_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19676,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19676, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 61);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19680,
-                0,
-                0,
-                32,
-                10,
-                49,
-                height + 29,
-                0,
-                10,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19680, 0, 0, 32, 10, 49, height + 29, 0, 10,
                 height + 11);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19677,
-                0,
-                0,
-                32,
-                2,
-                49,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19677, 0, 0, 32, 2, 49, height + 29, 0, 4,
                 height + 11);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19681,
-                0,
-                0,
-                32,
-                10,
-                49,
-                height + 29,
-                0,
-                10,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19681, 0, 0, 32, 10, 49, height + 29, 0, 10,
                 height + 11);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19678,
-                0,
-                0,
-                32,
-                2,
-                49,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19678, 0, 0, 32, 2, 49, height + 29, 0, 4,
                 height + 11);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19679,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19679, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 61);
             break;
     }
@@ -540,99 +296,35 @@ static void inverted_impulse_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008B04E0 */
 static void inverted_impulse_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19682,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19682, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 61);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19686,
-                0,
-                0,
-                32,
-                10,
-                49,
-                height + 29,
-                0,
-                10,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19686, 0, 0, 32, 10, 49, height + 29, 0, 10,
                 height + 11);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19683,
-                0,
-                0,
-                32,
-                2,
-                49,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19683, 0, 0, 32, 2, 49, height + 29, 0, 4,
                 height + 11);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19687,
-                0,
-                0,
-                32,
-                10,
-                49,
-                height + 29,
-                0,
-                10,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19687, 0, 0, 32, 10, 49, height + 29, 0, 10,
                 height + 11);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19684,
-                0,
-                0,
-                32,
-                2,
-                49,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19684, 0, 0, 32, 2, 49, height + 29, 0, 4,
                 height + 11);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19685,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19685, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 61);
             break;
     }
@@ -651,73 +343,29 @@ static void inverted_impulse_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008B04F0 */
 static void inverted_impulse_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19668,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19668, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19669,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19669, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19670,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19670, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19671,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19671, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -757,11 +405,7 @@ static void inverted_impulse_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x008B0500 */
 static void inverted_impulse_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_impulse_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -769,11 +413,7 @@ static void inverted_impulse_rc_track_25_deg_down(
 
 /** rct2: 0x008B0510 */
 static void inverted_impulse_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_impulse_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -781,11 +421,7 @@ static void inverted_impulse_rc_track_60_deg_down(
 
 /** rct2: 0x008B0520 */
 static void inverted_impulse_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_impulse_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -793,11 +429,7 @@ static void inverted_impulse_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008B0530 */
 static void inverted_impulse_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_impulse_rc_track_60_deg_up_to_25_deg_up(
@@ -806,11 +438,7 @@ static void inverted_impulse_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008B0540 */
 static void inverted_impulse_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_impulse_rc_track_25_deg_up_to_60_deg_up(
@@ -819,11 +447,7 @@ static void inverted_impulse_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008B0550 */
 static void inverted_impulse_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_impulse_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -831,11 +455,7 @@ static void inverted_impulse_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x008B05A0 */
 static void inverted_impulse_rc_track_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -845,62 +465,22 @@ static void inverted_impulse_rc_track_90_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19700,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19700, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 61);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19701,
-                        0,
-                        0,
-                        32,
-                        2,
-                        31,
-                        height + 29,
-                        0,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19701, 0, 0, 32, 2, 31, height + 29, 0, 4,
                         height + 11);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19702,
-                        0,
-                        0,
-                        32,
-                        2,
-                        31,
-                        height + 29,
-                        0,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19702, 0, 0, 32, 2, 31, height + 29, 0, 4,
                         height + 11);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19703,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19703, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 61);
                     break;
             }
@@ -916,11 +496,7 @@ static void inverted_impulse_rc_track_90_deg_up(
 
 /** rct2: 0x008B05B0 */
 static void inverted_impulse_rc_track_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_impulse_rc_track_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -928,11 +504,7 @@ static void inverted_impulse_rc_track_90_deg_down(
 
 /** rct2: 0x008B0560 */
 static void inverted_impulse_rc_track_60_deg_up_to_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -942,62 +514,22 @@ static void inverted_impulse_rc_track_60_deg_up_to_90_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19692,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19692, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 85);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19693,
-                        0,
-                        0,
-                        32,
-                        2,
-                        55,
-                        height + 29,
-                        0,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19693, 0, 0, 32, 2, 55, height + 29, 0, 4,
                         height + 11);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19694,
-                        0,
-                        0,
-                        32,
-                        2,
-                        55,
-                        height + 29,
-                        0,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19694, 0, 0, 32, 2, 55, height + 29, 0, 4,
                         height + 11);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19695,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19695, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 85);
                     break;
             }
@@ -1017,11 +549,7 @@ static void inverted_impulse_rc_track_60_deg_up_to_90_deg_up(
 
 /** rct2: 0x008B0570 */
 static void inverted_impulse_rc_track_90_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_impulse_rc_track_60_deg_up_to_90_deg_up(
@@ -1030,73 +558,29 @@ static void inverted_impulse_rc_track_90_deg_down_to_60_deg_down(
 
 /** rct2: 0x008B0580 */
 static void inverted_impulse_rc_track_90_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19696,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19696, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 85);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19697,
-                0,
-                0,
-                32,
-                2,
-                55,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19697, 0, 0, 32, 2, 55, height + 29, 0, 4,
                 height + 11);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19698,
-                0,
-                0,
-                32,
-                2,
-                55,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19698, 0, 0, 32, 2, 55, height + 29, 0, 4,
                 height + 11);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 19699,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 19699, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 85);
             break;
     }
@@ -1116,11 +600,7 @@ static void inverted_impulse_rc_track_90_deg_up_to_60_deg_up(
 
 /** rct2: 0x008B0590 */
 static void inverted_impulse_rc_track_60_deg_down_to_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1130,62 +610,22 @@ static void inverted_impulse_rc_track_60_deg_down_to_90_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19698,
-                        0,
-                        0,
-                        32,
-                        2,
-                        55,
-                        height + 29,
-                        0,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19698, 0, 0, 32, 2, 55, height + 29, 0, 4,
                         height + 11);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19699,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19699, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 85);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19696,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19696, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 85);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19697,
-                        0,
-                        0,
-                        32,
-                        2,
-                        55,
-                        height + 29,
-                        0,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19697, 0, 0, 32, 2, 55, height + 29, 0, 4,
                         height + 11);
                     break;
             }
@@ -1204,11 +644,7 @@ static void inverted_impulse_rc_track_60_deg_down_to_90_deg_down(
 
 /** rct2: 0x008B05C0 */
 static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1218,101 +654,31 @@ static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19708,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19708, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 125);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19709,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19709, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 125);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19717,
-                        0,
-                        0,
-                        2,
-                        32,
-                        31,
-                        height + 29,
-                        4,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19717, 0, 0, 2, 32, 31, height + 29, 4, 0,
                         height + 11);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19710,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19710, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 125);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19718,
-                        0,
-                        0,
-                        32,
-                        2,
-                        31,
-                        height + 29,
-                        0,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19718, 0, 0, 32, 2, 31, height + 29, 0, 4,
                         height + 11);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19711,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19711, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 125);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19719,
-                        0,
-                        0,
-                        32,
-                        2,
-                        31,
-                        height + 29,
-                        0,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19719, 0, 0, 32, 2, 31, height + 29, 0, 4,
                         height + 11);
                     break;
             }
@@ -1328,11 +694,7 @@ static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up(
 
 /** rct2: 0x008B05D0 */
 static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1342,101 +704,31 @@ static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19704,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19704, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 125);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19712,
-                        0,
-                        0,
-                        32,
-                        2,
-                        31,
-                        height + 29,
-                        0,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19712, 0, 0, 32, 2, 31, height + 29, 0, 4,
                         height + 11);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19705,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19705, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 125);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19713,
-                        0,
-                        0,
-                        32,
-                        2,
-                        31,
-                        height + 29,
-                        0,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19713, 0, 0, 32, 2, 31, height + 29, 0, 4,
                         height + 11);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19706,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19706, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 125);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19714,
-                        0,
-                        0,
-                        32,
-                        2,
-                        31,
-                        height + 29,
-                        0,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19714, 0, 0, 32, 2, 31, height + 29, 0, 4,
                         height + 11);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19707,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19707, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 125);
                     break;
             }
@@ -1452,11 +744,7 @@ static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up(
 
 /** rct2: 0x008B05E0 */
 static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_impulse_rc_track_right_quarter_turn_1_90_deg_up(
@@ -1465,11 +753,7 @@ static void inverted_impulse_rc_track_left_quarter_turn_1_90_deg_down(
 
 /** rct2: 0x008B05F0 */
 static void inverted_impulse_rc_track_right_quarter_turn_1_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_impulse_rc_track_left_quarter_turn_1_90_deg_up(
diff --git a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp
index 7f49d1b759..0093799295 100644
--- a/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/InvertedRollerCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x008A92E8 */
 static void inverted_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -35,33 +31,13 @@ static void inverted_rc_track_flat(
             case 0:
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27131,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27131, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 29);
                 break;
             case 1:
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27132,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27132, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 29);
                 break;
         }
@@ -73,33 +49,13 @@ static void inverted_rc_track_flat(
             case 0:
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27129,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27129, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 29);
                 break;
             case 1:
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27130,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27130, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 29);
                 break;
         }
@@ -118,11 +74,7 @@ static void inverted_rc_track_flat(
 
 /** rct2: 0x008A9558, 0x008A9568, 0x008A9578 */
 static void inverted_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -135,30 +87,10 @@ static void inverted_rc_track_station(
     sub_98197C_rotated(
         session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height, 0, 2, height);
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-        0,
-        0,
-        32,
-        20,
-        3,
-        height + 29,
-        0,
-        6,
+        session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 3, height + 29, 0, 6,
         height + 29);
     sub_98199C_rotated(
-        session,
-        direction,
-        imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS],
-        0,
-        6,
-        32,
-        20,
-        3,
-        height + 29,
-        0,
-        6,
+        session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 29, 0, 6,
         height + 29);
     track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 3);
     track_paint_util_draw_station_inverted(session, rideIndex, direction, height, tileElement, STATION_VARIANT_TALL);
@@ -169,11 +101,7 @@ static void inverted_rc_track_station(
 
 /** rct2: 0x008A92F8 */
 static void inverted_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -182,62 +110,22 @@ static void inverted_rc_track_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27249,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27249, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27250,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27250, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27251,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27251, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27252,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27252, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
         }
@@ -248,62 +136,22 @@ static void inverted_rc_track_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27221,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27221, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27222,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27222, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27223,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27223, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27224,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27224, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
         }
@@ -347,73 +195,29 @@ static void inverted_rc_track_25_deg_up(
 
 /** rct2: 0x008A9308 */
 static void inverted_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27237,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27237, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 93);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27238,
-                0,
-                0,
-                32,
-                2,
-                81,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27238, 0, 0, 32, 2, 81, height + 29, 0, 4,
                 height + 11);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27239,
-                0,
-                0,
-                32,
-                2,
-                81,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27239, 0, 0, 32, 2, 81, height + 29, 0, 4,
                 height + 11);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27240,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27240, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 93);
             break;
     }
@@ -432,11 +236,7 @@ static void inverted_rc_track_60_deg_up(
 
 /** rct2: 0x008A9318 */
 static void inverted_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -445,62 +245,22 @@ static void inverted_rc_track_flat_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27241,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27241, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27242,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27242, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27243,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27243, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27244,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27244, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
         }
@@ -511,62 +271,22 @@ static void inverted_rc_track_flat_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27213,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27213, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27214,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27214, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27215,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27215, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27216,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27216, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
         }
@@ -610,99 +330,35 @@ static void inverted_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x008A9328 */
 static void inverted_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27225,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27225, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 61);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27229,
-                0,
-                0,
-                32,
-                10,
-                49,
-                height + 29,
-                0,
-                10,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27229, 0, 0, 32, 10, 49, height + 29, 0, 10,
                 height + 11);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27226,
-                0,
-                0,
-                32,
-                2,
-                49,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27226, 0, 0, 32, 2, 49, height + 29, 0, 4,
                 height + 11);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27230,
-                0,
-                0,
-                32,
-                10,
-                49,
-                height + 29,
-                0,
-                10,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27230, 0, 0, 32, 10, 49, height + 29, 0, 10,
                 height + 11);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27227,
-                0,
-                0,
-                32,
-                2,
-                49,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27227, 0, 0, 32, 2, 49, height + 29, 0, 4,
                 height + 11);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27228,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27228, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 61);
             break;
     }
@@ -721,99 +377,35 @@ static void inverted_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008A9338 */
 static void inverted_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27231,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27231, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 61);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27235,
-                0,
-                0,
-                32,
-                10,
-                49,
-                height + 29,
-                0,
-                10,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27235, 0, 0, 32, 10, 49, height + 29, 0, 10,
                 height + 11);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27232,
-                0,
-                0,
-                32,
-                2,
-                49,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27232, 0, 0, 32, 2, 49, height + 29, 0, 4,
                 height + 11);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27236,
-                0,
-                0,
-                32,
-                10,
-                49,
-                height + 29,
-                0,
-                10,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27236, 0, 0, 32, 10, 49, height + 29, 0, 10,
                 height + 11);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27233,
-                0,
-                0,
-                32,
-                2,
-                49,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27233, 0, 0, 32, 2, 49, height + 29, 0, 4,
                 height + 11);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27234,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27234, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 61);
             break;
     }
@@ -856,11 +448,7 @@ static void inverted_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A9348 */
 static void inverted_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -869,62 +457,22 @@ static void inverted_rc_track_25_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27245,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27245, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27246,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27246, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27247,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27247, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27248,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27248, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
         }
@@ -935,62 +483,22 @@ static void inverted_rc_track_25_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27217,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27217, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27218,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27218, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27219,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27219, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 27220,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 27220, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
         }
@@ -1034,11 +542,7 @@ static void inverted_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x008A9358 */
 static void inverted_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1046,11 +550,7 @@ static void inverted_rc_track_25_deg_down(
 
 /** rct2: 0x008A9368 */
 static void inverted_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1058,11 +558,7 @@ static void inverted_rc_track_60_deg_down(
 
 /** rct2: 0x008A9378 */
 static void inverted_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1070,11 +566,7 @@ static void inverted_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008A9388 */
 static void inverted_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1082,11 +574,7 @@ static void inverted_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008A9398 */
 static void inverted_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1094,11 +582,7 @@ static void inverted_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A93A8 */
 static void inverted_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1106,11 +590,7 @@ static void inverted_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x008A93B8 */
 static void inverted_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1120,71 +600,29 @@ static void inverted_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27142,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27142, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27147,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27147, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27152,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27152, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27137,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27137, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1210,32 +648,12 @@ static void inverted_rc_track_left_quarter_turn_5(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27151,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27151, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27136,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27136, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
@@ -1243,8 +661,7 @@ static void inverted_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -1252,47 +669,17 @@ static void inverted_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27140,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27140, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27145,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27145, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27150,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27150, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 3:
@@ -1312,17 +699,7 @@ static void inverted_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27139,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27139, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
@@ -1335,17 +712,7 @@ static void inverted_rc_track_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27134,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27134, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 29);
                     break;
             }
@@ -1353,8 +720,7 @@ static void inverted_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -1362,71 +728,29 @@ static void inverted_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27138,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27138, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27143,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27143, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27148,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27148, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27133,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27133, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1446,11 +770,7 @@ static void inverted_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x008A93C8 */
 static void inverted_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1459,73 +779,29 @@ static void inverted_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x008A93D8 */
 static void inverted_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27269,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27269, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27270,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27270, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27271,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27271, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27272,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27272, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -1533,8 +809,7 @@ static void inverted_rc_track_flat_to_left_bank(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
@@ -1546,73 +821,29 @@ static void inverted_rc_track_flat_to_left_bank(
 
 /** rct2: 0x008A93E8 */
 static void inverted_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27273,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27273, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27274,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27274, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27275,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27275, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27276,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27276, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -1620,8 +851,7 @@ static void inverted_rc_track_flat_to_right_bank(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
@@ -1633,73 +863,29 @@ static void inverted_rc_track_flat_to_right_bank(
 
 /** rct2: 0x008A93F8 */
 static void inverted_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27275,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27275, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27276,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27276, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27273,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27273, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27274,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27274, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -1707,8 +893,7 @@ static void inverted_rc_track_left_bank_to_flat(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
@@ -1720,73 +905,29 @@ static void inverted_rc_track_left_bank_to_flat(
 
 /** rct2: 0x008A9408 */
 static void inverted_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27271,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27271, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27272,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27272, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27269,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27269, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27270,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27270, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -1794,8 +935,7 @@ static void inverted_rc_track_right_bank_to_flat(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
@@ -1807,11 +947,7 @@ static void inverted_rc_track_right_bank_to_flat(
 
 /** rct2: 0x008A9418 */
 static void inverted_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1821,71 +957,29 @@ static void inverted_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27162,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27162, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27167,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27167, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27172,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27172, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27157,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27157, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1911,32 +1005,12 @@ static void inverted_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27171,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27171, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27156,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27156, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
@@ -1944,8 +1018,7 @@ static void inverted_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -1953,47 +1026,17 @@ static void inverted_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27160,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27160, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27165,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27165, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27170,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27170, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 3:
@@ -2013,17 +1056,7 @@ static void inverted_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27159,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27159, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
@@ -2036,17 +1069,7 @@ static void inverted_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27154,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27154, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 29);
                     break;
             }
@@ -2054,8 +1077,7 @@ static void inverted_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -2063,71 +1085,29 @@ static void inverted_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27158,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27158, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27163,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27163, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27168,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27168, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27153,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27153, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2147,11 +1127,7 @@ static void inverted_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x008A9428 */
 static void inverted_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2160,73 +1136,29 @@ static void inverted_rc_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x008A9438 */
 static void inverted_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27277,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27277, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27278,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27278, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27279,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27279, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27280,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27280, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -2234,8 +1166,7 @@ static void inverted_rc_track_left_bank_to_25_deg_up(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         switch (direction)
@@ -2272,73 +1203,29 @@ static void inverted_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x008A9448 */
 static void inverted_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27281,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27281, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27282,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27282, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27283,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27283, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27284,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27284, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -2346,8 +1233,7 @@ static void inverted_rc_track_right_bank_to_25_deg_up(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         switch (direction)
@@ -2384,73 +1270,29 @@ static void inverted_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x008A9458 */
 static void inverted_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27285,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27285, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27286,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27286, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27287,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27287, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27288,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27288, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -2458,8 +1300,7 @@ static void inverted_rc_track_25_deg_up_to_left_bank(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         switch (direction)
@@ -2496,73 +1337,29 @@ static void inverted_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x008A9468 */
 static void inverted_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27289,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27289, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27290,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27290, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27291,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27291, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27292,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27292, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -2570,8 +1367,7 @@ static void inverted_rc_track_25_deg_up_to_right_bank(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         switch (direction)
@@ -2608,11 +1404,7 @@ static void inverted_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x008A9478 */
 static void inverted_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -2620,11 +1412,7 @@ static void inverted_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x008A9488 */
 static void inverted_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -2632,11 +1420,7 @@ static void inverted_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x008A9498 */
 static void inverted_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -2644,11 +1428,7 @@ static void inverted_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x008A94A8 */
 static void inverted_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -2656,73 +1436,29 @@ static void inverted_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x008A94B8 */
 static void inverted_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27293,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27293, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27294,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27294, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27295,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27295, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27296,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27296, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -2730,8 +1466,7 @@ static void inverted_rc_track_left_bank(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-        0xFFFF,
-        0);
+        0xFFFF, 0);
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         metal_a_supports_paint_setup(session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2743,11 +1478,7 @@ static void inverted_rc_track_left_bank(
 
 /** rct2: 0x008A94C8 */
 static void inverted_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -2755,11 +1486,7 @@ static void inverted_rc_track_right_bank(
 
 /** rct2: 0x008A94D8 */
 static void inverted_rc_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2786,10 +1513,8 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2826,8 +1551,7 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 3:
@@ -2881,8 +1605,7 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 6:
@@ -2907,10 +1630,8 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2930,11 +1651,7 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A94E8 */
 static void inverted_rc_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2961,10 +1678,8 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3001,8 +1716,7 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 3:
@@ -3056,8 +1770,7 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 6:
@@ -3082,10 +1795,8 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3105,11 +1816,7 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A94F8 */
 static void inverted_rc_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -3119,11 +1826,7 @@ static void inverted_rc_track_left_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A9508 */
 static void inverted_rc_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -3133,11 +1836,7 @@ static void inverted_rc_track_right_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A9518 */
 static void inverted_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3147,62 +1846,22 @@ static void inverted_rc_track_s_bend_left(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27253,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27253, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27257,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27257, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27256,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27256, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27260,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27260, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -3231,32 +1890,12 @@ static void inverted_rc_track_s_bend_left(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27255,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27255, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27259,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27259, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -3265,8 +1904,7 @@ static void inverted_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -3286,32 +1924,12 @@ static void inverted_rc_track_s_bend_left(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27255,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27255, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27259,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27259, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
@@ -3328,8 +1946,7 @@ static void inverted_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 2:
@@ -3349,62 +1966,22 @@ static void inverted_rc_track_s_bend_left(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27256,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27256, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27260,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27260, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27253,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27253, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27257,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27257, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -3430,11 +2007,7 @@ static void inverted_rc_track_s_bend_left(
 
 /** rct2: 0x008A9528 */
 static void inverted_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3444,62 +2017,22 @@ static void inverted_rc_track_s_bend_right(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27261,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27261, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27265,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27265, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27264,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27264, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27268,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27268, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -3520,32 +2053,12 @@ static void inverted_rc_track_s_bend_right(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27262,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27262, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27266,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27266, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
@@ -3562,8 +2075,7 @@ static void inverted_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -3591,32 +2103,12 @@ static void inverted_rc_track_s_bend_right(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27262,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27262, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27266,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27266, 0, 0, 32, 26, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -3625,8 +2117,7 @@ static void inverted_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 2:
@@ -3646,62 +2137,22 @@ static void inverted_rc_track_s_bend_right(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27264,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27264, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27268,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27268, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27261,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27261, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27265,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27265, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -3727,11 +2178,7 @@ static void inverted_rc_track_s_bend_right(
 
 /** rct2: 0x008A9538 */
 static void inverted_rc_track_left_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3741,62 +2188,22 @@ static void inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27355,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27355, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27363,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27363, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27362,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27362, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27370,
-                        0,
-                        6,
-                        32,
-                        10,
-                        7,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27370, 0, 6, 32, 10, 7, height + 29, 0, 6,
                         height + 45);
                     break;
             }
@@ -3806,8 +2213,7 @@ static void inverted_rc_track_left_vertical_loop(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -3839,62 +2245,22 @@ static void inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27356,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27356, 0, 0, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27364,
-                        0,
-                        14,
-                        32,
-                        2,
-                        63,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27364, 0, 14, 32, 2, 63, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27361,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27361, 0, 6, 32, 2, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27369,
-                        0,
-                        6,
-                        2,
-                        2,
-                        3,
-                        height + 29,
-                        29,
-                        20,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27369, 0, 6, 2, 2, 3, height + 29, 29, 20,
                         height + 29);
                     break;
             }
@@ -3906,62 +2272,22 @@ static void inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27357,
-                        16,
-                        0,
-                        5,
-                        2,
-                        119,
-                        height + 2,
-                        16,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27357, 16, 0, 5, 2, 119, height + 2, 16, 29,
                         height + 2);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27365,
-                        12,
-                        0,
-                        32,
-                        2,
-                        119,
-                        height + 2,
-                        0,
-                        -6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27365, 12, 0, 32, 2, 119, height + 2, 0, -6,
                         height + 2);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27360,
-                        10,
-                        16,
-                        4,
-                        2,
-                        119,
-                        height + 2,
-                        10,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27360, 10, 16, 4, 2, 119, height + 2, 10, 0,
                         height + 2);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27368,
-                        16,
-                        16,
-                        2,
-                        2,
-                        119,
-                        height + 2,
-                        29,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27368, 16, 16, 2, 2, 119, height + 2, 29, 29,
                         height + 2);
                     break;
             }
@@ -3974,62 +2300,22 @@ static void inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27358,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27358, 0, 0, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27366,
-                        0,
-                        0,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27366, 0, 0, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27359,
-                        0,
-                        16,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27359, 0, 16, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27367,
-                        0,
-                        16,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27367, 0, 16, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
             }
@@ -4037,8 +2323,7 @@ static void inverted_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 4:
@@ -4052,62 +2337,22 @@ static void inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27359,
-                        0,
-                        16,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27359, 0, 16, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27367,
-                        0,
-                        16,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27367, 0, 16, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27358,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27358, 0, 0, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27366,
-                        0,
-                        0,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27366, 0, 0, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
             }
@@ -4115,8 +2360,7 @@ static void inverted_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 7:
@@ -4124,62 +2368,22 @@ static void inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27360,
-                        10,
-                        16,
-                        4,
-                        2,
-                        119,
-                        height + 2,
-                        10,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27360, 10, 16, 4, 2, 119, height + 2, 10, 0,
                         height + 2);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27368,
-                        16,
-                        16,
-                        2,
-                        2,
-                        119,
-                        height + 2,
-                        29,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27368, 16, 16, 2, 2, 119, height + 2, 29, 29,
                         height + 2);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27357,
-                        16,
-                        0,
-                        5,
-                        2,
-                        119,
-                        height + 2,
-                        16,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27357, 16, 0, 5, 2, 119, height + 2, 16, 29,
                         height + 2);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27365,
-                        12,
-                        0,
-                        32,
-                        2,
-                        119,
-                        height + 2,
-                        0,
-                        -6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27365, 12, 0, 32, 2, 119, height + 2, 0, -6,
                         height + 2);
                     break;
             }
@@ -4192,62 +2396,22 @@ static void inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27361,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27361, 0, 6, 32, 2, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27369,
-                        0,
-                        6,
-                        2,
-                        2,
-                        3,
-                        height + 29,
-                        29,
-                        20,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27369, 0, 6, 2, 2, 3, height + 29, 29, 20,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27356,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27356, 0, 0, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27364,
-                        0,
-                        14,
-                        32,
-                        2,
-                        63,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27364, 0, 14, 32, 2, 63, height + 29, 0, 29,
                         height + 29);
                     break;
             }
@@ -4259,62 +2423,22 @@ static void inverted_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27362,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27362, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27370,
-                        0,
-                        6,
-                        32,
-                        10,
-                        7,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27370, 0, 6, 32, 10, 7, height + 29, 0, 6,
                         height + 45);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27355,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27355, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27363,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27363, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
             }
@@ -4324,8 +2448,7 @@ static void inverted_rc_track_left_vertical_loop(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -4362,11 +2485,7 @@ static void inverted_rc_track_left_vertical_loop(
 
 /** rct2: 0x008A9548 */
 static void inverted_rc_track_right_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4376,62 +2495,22 @@ static void inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27386,
-                        0,
-                        6,
-                        32,
-                        10,
-                        7,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27386, 0, 6, 32, 10, 7, height + 29, 0, 6,
                         height + 45);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27378,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27378, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27379,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27379, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27371,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27371, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
             }
@@ -4441,8 +2520,7 @@ static void inverted_rc_track_right_vertical_loop(
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -4474,62 +2552,22 @@ static void inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27385,
-                        0,
-                        6,
-                        2,
-                        2,
-                        3,
-                        height + 29,
-                        29,
-                        20,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27385, 0, 6, 2, 2, 3, height + 29, 29, 20,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27377,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27377, 0, 6, 32, 2, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27380,
-                        0,
-                        14,
-                        32,
-                        2,
-                        63,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27380, 0, 14, 32, 2, 63, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27372,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27372, 0, 0, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
             }
@@ -4541,62 +2579,22 @@ static void inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27384,
-                        16,
-                        16,
-                        2,
-                        2,
-                        119,
-                        height + 2,
-                        29,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27384, 16, 16, 2, 2, 119, height + 2, 29, 29,
                         height + 2);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27376,
-                        10,
-                        16,
-                        4,
-                        2,
-                        119,
-                        height + 2,
-                        10,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27376, 10, 16, 4, 2, 119, height + 2, 10, 0,
                         height + 2);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27381,
-                        12,
-                        0,
-                        32,
-                        2,
-                        119,
-                        height + 2,
-                        0,
-                        -6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27381, 12, 0, 32, 2, 119, height + 2, 0, -6,
                         height + 2);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27373,
-                        16,
-                        0,
-                        5,
-                        2,
-                        119,
-                        height + 2,
-                        16,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27373, 16, 0, 5, 2, 119, height + 2, 16, 29,
                         height + 2);
                     break;
             }
@@ -4609,62 +2607,22 @@ static void inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27383,
-                        0,
-                        16,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27383, 0, 16, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27375,
-                        0,
-                        16,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27375, 0, 16, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27382,
-                        0,
-                        0,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27382, 0, 0, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27374,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27374, 0, 0, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
             }
@@ -4672,8 +2630,7 @@ static void inverted_rc_track_right_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 4:
@@ -4687,62 +2644,22 @@ static void inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27382,
-                        0,
-                        0,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27382, 0, 0, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27374,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27374, 0, 0, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27383,
-                        0,
-                        16,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27383, 0, 16, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27375,
-                        0,
-                        16,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27375, 0, 16, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
             }
@@ -4750,8 +2667,7 @@ static void inverted_rc_track_right_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 7:
@@ -4759,62 +2675,22 @@ static void inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27381,
-                        12,
-                        0,
-                        32,
-                        2,
-                        119,
-                        height + 2,
-                        0,
-                        -6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27381, 12, 0, 32, 2, 119, height + 2, 0, -6,
                         height + 2);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27373,
-                        16,
-                        0,
-                        5,
-                        2,
-                        119,
-                        height + 2,
-                        16,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27373, 16, 0, 5, 2, 119, height + 2, 16, 29,
                         height + 2);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27384,
-                        16,
-                        16,
-                        2,
-                        2,
-                        119,
-                        height + 2,
-                        29,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27384, 16, 16, 2, 2, 119, height + 2, 29, 29,
                         height + 2);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27376,
-                        10,
-                        16,
-                        4,
-                        2,
-                        119,
-                        height + 2,
-                        10,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27376, 10, 16, 4, 2, 119, height + 2, 10, 0,
                         height + 2);
                     break;
             }
@@ -4827,62 +2703,22 @@ static void inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27380,
-                        0,
-                        14,
-                        32,
-                        2,
-                        63,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27380, 0, 14, 32, 2, 63, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27372,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27372, 0, 0, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27385,
-                        0,
-                        6,
-                        2,
-                        2,
-                        3,
-                        height + 29,
-                        29,
-                        20,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27385, 0, 6, 2, 2, 3, height + 29, 29, 20,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27377,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27377, 0, 6, 32, 2, 3, height + 29, 0, 0,
                         height + 29);
                     break;
             }
@@ -4894,62 +2730,22 @@ static void inverted_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27379,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27379, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27371,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27371, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27386,
-                        0,
-                        6,
-                        32,
-                        10,
-                        7,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27386, 0, 6, 32, 10, 7, height + 29, 0, 6,
                         height + 45);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27378,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27378, 0, 6, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
             }
@@ -4959,8 +2755,7 @@ static void inverted_rc_track_right_vertical_loop(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -4997,11 +2792,7 @@ static void inverted_rc_track_right_vertical_loop(
 
 /** rct2: 0x008A9588 */
 static void inverted_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5011,71 +2802,29 @@ static void inverted_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27392,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27392, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27395,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27395, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27398,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27398, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27389,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27389, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5093,17 +2842,7 @@ static void inverted_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27391,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27391, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
@@ -5112,32 +2851,12 @@ static void inverted_rc_track_left_quarter_turn_3(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27397,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27397, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27388,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27388, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
             }
@@ -5150,71 +2869,29 @@ static void inverted_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27390,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27390, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27393,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27393, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27396,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27396, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27387,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27387, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5234,11 +2911,7 @@ static void inverted_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x008A9598 */
 static void inverted_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -5247,11 +2920,7 @@ static void inverted_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x008A95A8 */
 static void inverted_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5261,71 +2930,29 @@ static void inverted_rc_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27404,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27404, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27407,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27407, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27410,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27410, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27401,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27401, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5343,62 +2970,22 @@ static void inverted_rc_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27403,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27403, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27406,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27406, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27409,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27409, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27400,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27400, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
             }
@@ -5411,71 +2998,29 @@ static void inverted_rc_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27402,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27402, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27405,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27405, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27408,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27408, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27399,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27399, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5495,11 +3040,7 @@ static void inverted_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x008A95B8 */
 static void inverted_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -5508,11 +3049,7 @@ static void inverted_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x008A95C8 */
 static void inverted_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5539,10 +3076,8 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 52, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5580,10 +3115,8 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 52, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5603,11 +3136,7 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A95D8 */
 static void inverted_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5634,10 +3163,8 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 52, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5675,10 +3202,8 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 52, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5698,11 +3223,7 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A95E8 */
 static void inverted_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -5712,11 +3233,7 @@ static void inverted_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A95F8 */
 static void inverted_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -5726,11 +3243,7 @@ static void inverted_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A9608 */
 static void inverted_rc_track_left_twist_down_to_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5760,8 +3273,7 @@ static void inverted_rc_track_left_twist_down_to_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5795,8 +3307,7 @@ static void inverted_rc_track_left_twist_down_to_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -5833,8 +3344,7 @@ static void inverted_rc_track_left_twist_down_to_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
     }
@@ -5842,11 +3352,7 @@ static void inverted_rc_track_left_twist_down_to_up(
 
 /** rct2: 0x008A9618 */
 static void inverted_rc_track_right_twist_down_to_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5876,8 +3382,7 @@ static void inverted_rc_track_right_twist_down_to_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5911,8 +3416,7 @@ static void inverted_rc_track_right_twist_down_to_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -5949,8 +3453,7 @@ static void inverted_rc_track_right_twist_down_to_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
     }
@@ -5958,11 +3461,7 @@ static void inverted_rc_track_right_twist_down_to_up(
 
 /** rct2: 0x008A9628 */
 static void inverted_rc_track_left_twist_up_to_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5996,8 +3495,7 @@ static void inverted_rc_track_left_twist_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 1:
@@ -6024,8 +3522,7 @@ static void inverted_rc_track_left_twist_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -6053,8 +3550,7 @@ static void inverted_rc_track_left_twist_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -6074,11 +3570,7 @@ static void inverted_rc_track_left_twist_up_to_down(
 
 /** rct2: 0x008A9638 */
 static void inverted_rc_track_right_twist_up_to_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6112,8 +3604,7 @@ static void inverted_rc_track_right_twist_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 1:
@@ -6140,8 +3631,7 @@ static void inverted_rc_track_right_twist_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -6169,8 +3659,7 @@ static void inverted_rc_track_right_twist_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -6190,11 +3679,7 @@ static void inverted_rc_track_right_twist_up_to_down(
 
 /** rct2: 0x008A9648 */
 static void inverted_rc_track_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6204,62 +3689,22 @@ static void inverted_rc_track_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27451,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27451, 0, 6, 32, 20, 3, height + 29, 0, 6,
                         height + 45);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27459,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27459, 0, 6, 32, 20, 3, height + 29, 0, 6,
                         height + 45);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27458,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27458, 0, 6, 32, 20, 3, height + 29, 0, 6,
                         height + 45);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27466,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27466, 0, 6, 32, 20, 3, height + 29, 0, 6,
                         height + 45);
                     break;
             }
@@ -6297,62 +3742,22 @@ static void inverted_rc_track_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27452,
-                        0,
-                        0,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27452, 0, 0, 32, 2, 3, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27460,
-                        0,
-                        14,
-                        32,
-                        2,
-                        63,
-                        height + 29,
-                        0,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27460, 0, 14, 32, 2, 63, height + 29, 0, 29,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27457,
-                        0,
-                        6,
-                        32,
-                        2,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27457, 0, 6, 32, 2, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27465,
-                        0,
-                        6,
-                        2,
-                        2,
-                        3,
-                        height + 29,
-                        29,
-                        20,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27465, 0, 6, 2, 2, 3, height + 29, 29, 20,
                         height + 29);
                     break;
             }
@@ -6364,62 +3769,22 @@ static void inverted_rc_track_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27453,
-                        16,
-                        0,
-                        5,
-                        2,
-                        119,
-                        height + 2,
-                        16,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27453, 16, 0, 5, 2, 119, height + 2, 16, 29,
                         height + 2);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27461,
-                        12,
-                        0,
-                        32,
-                        2,
-                        119,
-                        height + 2,
-                        0,
-                        -6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27461, 12, 0, 32, 2, 119, height + 2, 0, -6,
                         height + 2);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27456,
-                        10,
-                        16,
-                        4,
-                        2,
-                        119,
-                        height + 2,
-                        10,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27456, 10, 16, 4, 2, 119, height + 2, 10, 0,
                         height + 2);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27464,
-                        16,
-                        16,
-                        2,
-                        2,
-                        119,
-                        height + 2,
-                        29,
-                        29,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27464, 16, 16, 2, 2, 119, height + 2, 29, 29,
                         height + 2);
                     break;
             }
@@ -6427,8 +3792,7 @@ static void inverted_rc_track_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 168, 0x20);
             break;
         case 3:
@@ -6436,62 +3800,22 @@ static void inverted_rc_track_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27454,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 34,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27454, 0, 0, 32, 20, 3, height + 34, 0, 6,
                         height + 34);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27462,
-                        0,
-                        0,
-                        2,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27462, 0, 0, 2, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27455,
-                        0,
-                        16,
-                        32,
-                        2,
-                        3,
-                        height + 34,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27455, 0, 16, 32, 2, 3, height + 34, 0, 0,
                         height - 6);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27463,
-                        0,
-                        16,
-                        32,
-                        20,
-                        3,
-                        height + 34,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27463, 0, 16, 32, 20, 3, height + 34, 0, 6,
                         height + 34);
                     break;
             }
@@ -6508,11 +3832,7 @@ static void inverted_rc_track_half_loop_up(
 
 /** rct2: 0x008A9658 */
 static void inverted_rc_track_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, tileElement);
@@ -6520,11 +3840,7 @@ static void inverted_rc_track_half_loop_down(
 
 /** rct2: 0x008A9668 */
 static void inverted_rc_track_left_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6534,62 +3850,22 @@ static void inverted_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27467,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27467, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27470,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27470, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27473,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27473, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27476,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27476, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
             }
@@ -6598,8 +3874,7 @@ static void inverted_rc_track_left_corkscrew_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 50, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -6614,62 +3889,22 @@ static void inverted_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27468,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27468, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27471,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27471, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27474,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27474, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27477,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27477, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
             }
@@ -6681,62 +3916,22 @@ static void inverted_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27469,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27469, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27472,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27472, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27475,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27475, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27478,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27478, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
             }
@@ -6755,8 +3950,7 @@ static void inverted_rc_track_left_corkscrew_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
     }
@@ -6764,11 +3958,7 @@ static void inverted_rc_track_left_corkscrew_up(
 
 /** rct2: 0x008A9678 */
 static void inverted_rc_track_right_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6778,62 +3968,22 @@ static void inverted_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27479,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27479, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27482,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27482, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27485,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27485, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27488,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27488, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 33);
                     break;
             }
@@ -6842,8 +3992,7 @@ static void inverted_rc_track_right_corkscrew_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 50, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -6858,62 +4007,22 @@ static void inverted_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27480,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27480, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27483,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27483, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27486,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27486, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27489,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height + 14,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27489, 0, 0, 20, 20, 3, height + 14, 6, 6,
                         height + 24);
                     break;
             }
@@ -6925,62 +4034,22 @@ static void inverted_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27481,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27481, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27484,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27484, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27487,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27487, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27490,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27490, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 39);
                     break;
             }
@@ -6999,8 +4068,7 @@ static void inverted_rc_track_right_corkscrew_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
     }
@@ -7008,11 +4076,7 @@ static void inverted_rc_track_right_corkscrew_up(
 
 /** rct2: 0x008A9688 */
 static void inverted_rc_track_left_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_right_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, tileElement);
@@ -7020,11 +4084,7 @@ static void inverted_rc_track_left_corkscrew_down(
 
 /** rct2: 0x008A9698 */
 static void inverted_rc_track_right_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_left_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, tileElement);
@@ -7032,11 +4092,7 @@ static void inverted_rc_track_right_corkscrew_down(
 
 /** rct2: 0x008A96D8 */
 static void inverted_rc_track_left_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -7073,11 +4129,7 @@ static void inverted_rc_track_left_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008A96B8 */
 static void inverted_rc_track_right_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -7114,11 +4166,7 @@ static void inverted_rc_track_right_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008A96C8 */
 static void inverted_rc_track_left_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_right_quarter_turn_1_60_deg_up(
@@ -7127,11 +4175,7 @@ static void inverted_rc_track_left_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008A96E8 */
 static void inverted_rc_track_right_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_left_quarter_turn_1_60_deg_up(
@@ -7140,11 +4184,7 @@ static void inverted_rc_track_right_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008A96A8 */
 static void inverted_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -7152,33 +4192,13 @@ static void inverted_rc_track_brakes(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27337,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27337, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27338,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27338, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -7196,11 +4216,7 @@ static void inverted_rc_track_brakes(
 
 /** rct2: 0x008A96F8 */
 static void inverted_rc_track_left_quarter_banked_helix_large_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7210,71 +4226,29 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27202,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27202, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27207,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27207, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27212,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27212, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27197,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27197, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 46, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -7292,62 +4266,22 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27201,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27201, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27206,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27206, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27211,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27211, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27196,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27196, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
             }
@@ -7355,8 +4289,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -7364,62 +4297,22 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27200,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27200, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27205,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27205, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27210,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27210, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27195,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27195, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
             }
@@ -7435,62 +4328,22 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27199,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27199, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27204,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27204, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27209,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27209, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27194,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27194, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
             }
@@ -7498,8 +4351,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -7507,71 +4359,29 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27198,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27198, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27203,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27203, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27208,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27208, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27193,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27193, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 58, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -7591,11 +4401,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_up(
 
 /** rct2: 0x008A9708 */
 static void inverted_rc_track_right_quarter_banked_helix_large_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7605,71 +4411,29 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27173,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27173, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27178,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27178, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27183,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27183, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27188,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27188, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 46, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -7687,62 +4451,22 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27174,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27174, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27179,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27179, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27184,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27184, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27189,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27189, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
             }
@@ -7750,8 +4474,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -7759,62 +4482,22 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27175,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27175, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27180,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27180, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27185,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27185, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27190,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27190, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
             }
@@ -7830,62 +4513,22 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27176,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27176, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27181,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27181, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27186,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27186, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27191,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27191, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
             }
@@ -7893,8 +4536,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -7902,71 +4544,29 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27177,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27177, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27182,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27182, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27187,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27187, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27192,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27192, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 58, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -7986,11 +4586,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_up(
 
 /** rct2: 0x008A9718 */
 static void inverted_rc_track_left_quarter_banked_helix_large_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8000,71 +4596,29 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27182,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27182, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27187,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27187, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27192,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27192, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27177,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27177, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 58, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8082,62 +4636,22 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27181,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27181, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27186,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27186, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27191,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27191, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27176,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27176, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
             }
@@ -8145,8 +4659,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -8154,62 +4667,22 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27180,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27180, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27185,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27185, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27190,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27190, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27175,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27175, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
             }
@@ -8225,62 +4698,22 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27179,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27179, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27184,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27184, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27189,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27189, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27174,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27174, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
             }
@@ -8288,8 +4721,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -8297,71 +4729,29 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27178,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27178, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27183,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27183, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27188,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27188, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27173,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27173, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 46, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8381,11 +4771,7 @@ static void inverted_rc_track_left_quarter_banked_helix_large_down(
 
 /** rct2: 0x008A9728 */
 static void inverted_rc_track_right_quarter_banked_helix_large_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8395,71 +4781,29 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27193,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27193, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27198,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27198, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27203,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27203, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27208,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27208, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 58, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8477,62 +4821,22 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27194,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27194, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27199,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27199, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27204,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27204, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27209,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27209, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
             }
@@ -8540,8 +4844,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -8549,62 +4852,22 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27195,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27195, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27200,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27200, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27205,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27205, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27210,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27210, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
             }
@@ -8620,62 +4883,22 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27196,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27196, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27201,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27201, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27206,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27206, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27211,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27211, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
             }
@@ -8683,8 +4906,7 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -8692,71 +4914,29 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27197,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27197, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27202,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27202, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27207,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27207, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27212,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27212, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 46, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8776,73 +4956,29 @@ static void inverted_rc_track_right_quarter_banked_helix_large_down(
 
 /** rct2: 0x008A9A38 */
 static void inverted_rc_track_25_deg_up_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27711,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27711, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27712,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27712, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27713,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27713, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27714,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27714, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
     }
@@ -8885,73 +5021,29 @@ static void inverted_rc_track_25_deg_up_left_banked(
 
 /** rct2: 0x008A9A48 */
 static void inverted_rc_track_25_deg_up_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27715,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27715, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27716,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27716, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27717,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27717, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27718,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27718, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
     }
@@ -8994,11 +5086,7 @@ static void inverted_rc_track_25_deg_up_right_banked(
 
 /** rct2: 0x008A9738 */
 static void inverted_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -9008,17 +5096,7 @@ static void inverted_rc_track_on_ride_photo(
             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]);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27129,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27129, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
@@ -9026,17 +5104,7 @@ static void inverted_rc_track_on_ride_photo(
             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]);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27130,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27130, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 2:
@@ -9044,17 +5112,7 @@ static void inverted_rc_track_on_ride_photo(
             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]);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27129,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27129, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 3:
@@ -9062,17 +5120,7 @@ static void inverted_rc_track_on_ride_photo(
             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]);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27130,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27130, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -9084,11 +5132,7 @@ static void inverted_rc_track_on_ride_photo(
 
 /** rct2: 0x008A9A58 */
 static void inverted_rc_track_25_deg_down_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -9096,11 +5140,7 @@ static void inverted_rc_track_25_deg_down_left_banked(
 
 /** rct2: 0x008A9A68 */
 static void inverted_rc_track_25_deg_down_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -9108,11 +5148,7 @@ static void inverted_rc_track_25_deg_down_right_banked(
 
 /** rct2: 0x008A9748 */
 static void inverted_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9122,62 +5158,22 @@ static void inverted_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27507,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27507, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27511,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27511, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27515,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27515, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27519,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27519, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -9198,62 +5194,22 @@ static void inverted_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27508,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27508, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27512,
-                        0,
-                        0,
-                        34,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27512, 0, 0, 34, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27516,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27516, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27520,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27520, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
@@ -9261,8 +5217,7 @@ static void inverted_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -9270,70 +5225,28 @@ static void inverted_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27509,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27509, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27513,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27513, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27517,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27517, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27521,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27521, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -9346,62 +5259,22 @@ static void inverted_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27510,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27510, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27514,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27514, 0, 0, 16, 18, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27518,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27518, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27522,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27522, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
             }
@@ -9410,8 +5283,7 @@ static void inverted_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -9439,11 +5311,7 @@ static void inverted_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x008A9758 */
 static void inverted_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9453,62 +5321,22 @@ static void inverted_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27491,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27491, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27495,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27495, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27499,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27499, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27503,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27503, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -9529,62 +5357,22 @@ static void inverted_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27492,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27492, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27496,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27496, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27500,
-                        0,
-                        0,
-                        34,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27500, 0, 0, 34, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27504,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27504, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
             }
@@ -9592,8 +5380,7 @@ static void inverted_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -9601,70 +5388,28 @@ static void inverted_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27493,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27493, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27497,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27497, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27501,
-                        0,
-                        0,
-                        28,
-                        28,
-                        3,
-                        height + 29,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27501, 0, 0, 28, 28, 3, height + 29, 4, 4,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27505,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27505, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -9677,62 +5422,22 @@ static void inverted_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27494,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27494, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27498,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27498, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27502,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27502, 0, 0, 16, 18, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27506,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27506, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
             }
@@ -9741,8 +5446,7 @@ static void inverted_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -9770,11 +5474,7 @@ static void inverted_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x008A9768 */
 static void inverted_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -9783,11 +5483,7 @@ static void inverted_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008A9778 */
 static void inverted_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -9796,11 +5492,7 @@ static void inverted_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008A9938 */
 static void inverted_rc_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9810,62 +5502,22 @@ static void inverted_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27539,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27539, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27543,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27543, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27547,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27547, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27551,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27551, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -9886,62 +5538,22 @@ static void inverted_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27540,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27540, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27544,
-                        0,
-                        0,
-                        34,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27544, 0, 0, 34, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27548,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27548, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27552,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27552, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
@@ -9949,8 +5561,7 @@ static void inverted_rc_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -9958,70 +5569,28 @@ static void inverted_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27541,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27541, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27545,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27545, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27549,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27549, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27553,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27553, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -10034,62 +5603,22 @@ static void inverted_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27542,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27542, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27546,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27546, 0, 0, 16, 18, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27550,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27550, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27554,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27554, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
             }
@@ -10098,8 +5627,7 @@ static void inverted_rc_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -10127,11 +5655,7 @@ static void inverted_rc_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x008A9948 */
 static void inverted_rc_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10141,62 +5665,22 @@ static void inverted_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27523,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27523, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27527,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27527, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27531,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27531, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27535,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27535, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -10217,62 +5701,22 @@ static void inverted_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27524,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27524, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27528,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27528, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27532,
-                        0,
-                        0,
-                        34,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27532, 0, 0, 34, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27536,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27536, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
             }
@@ -10280,8 +5724,7 @@ static void inverted_rc_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -10289,70 +5732,28 @@ static void inverted_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27525,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27525, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27529,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27529, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27533,
-                        0,
-                        0,
-                        28,
-                        28,
-                        3,
-                        height + 29,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27533, 0, 0, 28, 28, 3, height + 29, 4, 4,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27537,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27537, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -10365,62 +5766,22 @@ static void inverted_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27526,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27526, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27530,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27530, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27534,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27534, 0, 0, 16, 18, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27538,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27538, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
             }
@@ -10429,8 +5790,7 @@ static void inverted_rc_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -10458,11 +5818,7 @@ static void inverted_rc_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x008A9958 */
 static void inverted_rc_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -10471,11 +5827,7 @@ static void inverted_rc_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008A9968 */
 static void inverted_rc_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -10484,11 +5836,7 @@ static void inverted_rc_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008A9788 */
 static void inverted_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10500,18 +5848,8 @@ static void inverted_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27614,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27614, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -10521,18 +5859,8 @@ static void inverted_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27558,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27558, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -10547,18 +5875,8 @@ static void inverted_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27611,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27611, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -10568,18 +5886,8 @@ static void inverted_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27555,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27555, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -10594,18 +5902,8 @@ static void inverted_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27613,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27613, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -10615,18 +5913,8 @@ static void inverted_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27557,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27557, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -10641,18 +5929,8 @@ static void inverted_rc_track_diag_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27612,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27612, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -10662,18 +5940,8 @@ static void inverted_rc_track_diag_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27556,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27556, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -10707,11 +5975,7 @@ static void inverted_rc_track_diag_flat(
 
 /** rct2: 0x008A97B8 */
 static void inverted_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10723,18 +5987,8 @@ static void inverted_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27626,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27626, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -10744,18 +5998,8 @@ static void inverted_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27570,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27570, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -10770,18 +6014,8 @@ static void inverted_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27623,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27623, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -10791,18 +6025,8 @@ static void inverted_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27567,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27567, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -10817,18 +6041,8 @@ static void inverted_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27625,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27625, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -10838,18 +6052,8 @@ static void inverted_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27569,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27569, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -10864,18 +6068,8 @@ static void inverted_rc_track_diag_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27624,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27624, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -10885,18 +6079,8 @@ static void inverted_rc_track_diag_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27568,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27568, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -10930,11 +6114,7 @@ static void inverted_rc_track_diag_25_deg_up(
 
 /** rct2: 0x008A9818 */
 static void inverted_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10944,18 +6124,8 @@ static void inverted_rc_track_diag_60_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27582,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27582, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -10967,18 +6137,8 @@ static void inverted_rc_track_diag_60_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27579,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27579, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -10990,18 +6150,8 @@ static void inverted_rc_track_diag_60_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27581,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27581, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -11013,18 +6163,8 @@ static void inverted_rc_track_diag_60_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27580,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27580, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
@@ -11057,11 +6197,7 @@ static void inverted_rc_track_diag_60_deg_up(
 
 /** rct2: 0x008A9798 */
 static void inverted_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11073,18 +6209,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27618,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27618, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11094,18 +6220,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27562,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27562, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11120,18 +6236,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27615,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27615, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11141,18 +6247,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27559,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27559, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11167,18 +6263,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27617,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27617, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11188,18 +6274,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27561,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27561, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11214,18 +6290,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27616,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27616, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11235,18 +6301,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27560,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27560, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11280,11 +6336,7 @@ static void inverted_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008A97F8 */
 static void inverted_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11294,18 +6346,8 @@ static void inverted_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27574,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27574, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -11317,18 +6359,8 @@ static void inverted_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27571,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27571, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -11340,18 +6372,8 @@ static void inverted_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27573,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27573, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -11363,18 +6385,8 @@ static void inverted_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27572,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27572, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
 
@@ -11407,11 +6419,7 @@ static void inverted_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008A9808 */
 static void inverted_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11421,18 +6429,8 @@ static void inverted_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27578,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27578, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -11444,18 +6442,8 @@ static void inverted_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27575,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27575, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -11467,18 +6455,8 @@ static void inverted_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27577,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27577, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -11490,17 +6468,7 @@ static void inverted_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27576,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27576, -16, -16, 16, 16, 3, height + 29, 0, 0,
                         height + 61);
                     break;
             }
@@ -11534,11 +6502,7 @@ static void inverted_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A97A8 */
 static void inverted_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11550,18 +6514,8 @@ static void inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27622,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27622, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11571,18 +6525,8 @@ static void inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27566,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27566, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11597,18 +6541,8 @@ static void inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27619,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27619, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11618,18 +6552,8 @@ static void inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27563,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27563, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11644,18 +6568,8 @@ static void inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27621,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27621, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11665,18 +6579,8 @@ static void inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27565,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27565, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11691,18 +6595,8 @@ static void inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27620,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27620, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11712,18 +6606,8 @@ static void inverted_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27564,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27564, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -11757,11 +6641,7 @@ static void inverted_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008A97E8 */
 static void inverted_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11773,18 +6653,8 @@ static void inverted_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27624,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27624, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11794,18 +6664,8 @@ static void inverted_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27568,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27568, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11820,18 +6680,8 @@ static void inverted_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27625,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27625, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11841,18 +6691,8 @@ static void inverted_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27569,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27569, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11867,18 +6707,8 @@ static void inverted_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27623,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27623, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11888,18 +6718,8 @@ static void inverted_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27567,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27567, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11914,18 +6734,8 @@ static void inverted_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27626,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27626, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11935,18 +6745,8 @@ static void inverted_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27570,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27570, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -11980,11 +6780,7 @@ static void inverted_rc_track_diag_25_deg_down(
 
 /** rct2: 0x008A9848 */
 static void inverted_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11994,18 +6790,8 @@ static void inverted_rc_track_diag_60_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27580,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27580, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12017,18 +6803,8 @@ static void inverted_rc_track_diag_60_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27581,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27581, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12040,18 +6816,8 @@ static void inverted_rc_track_diag_60_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27579,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27579, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12063,18 +6829,8 @@ static void inverted_rc_track_diag_60_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27582,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27582, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
 
@@ -12107,11 +6863,7 @@ static void inverted_rc_track_diag_60_deg_down(
 
 /** rct2: 0x008A97C8 */
 static void inverted_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12123,18 +6875,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27620,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27620, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12144,18 +6886,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27564,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27564, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12169,18 +6901,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27621,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27621, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12190,18 +6912,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27565,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27565, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12215,18 +6927,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27619,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27619, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12236,18 +6938,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27563,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27563, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12261,18 +6953,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27622,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27622, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12282,18 +6964,8 @@ static void inverted_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27566,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27566, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12327,11 +6999,7 @@ static void inverted_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008A9828 */
 static void inverted_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12341,17 +7009,7 @@ static void inverted_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27576,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27576, -16, -16, 16, 16, 3, height + 29, 0, 0,
                         height + 61);
                     break;
             }
@@ -12364,18 +7022,8 @@ static void inverted_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27577,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27577, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12387,18 +7035,8 @@ static void inverted_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27575,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27575, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12410,18 +7048,8 @@ static void inverted_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27578,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27578, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
 
@@ -12454,11 +7082,7 @@ static void inverted_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008A9838 */
 static void inverted_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12468,18 +7092,8 @@ static void inverted_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27572,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27572, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12491,18 +7105,8 @@ static void inverted_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27573,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27573, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12514,18 +7118,8 @@ static void inverted_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27571,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27571, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12537,18 +7131,8 @@ static void inverted_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27574,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27574, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
 
@@ -12581,11 +7165,7 @@ static void inverted_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A97D8 */
 static void inverted_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12597,18 +7177,8 @@ static void inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27616,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27616, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12618,18 +7188,8 @@ static void inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27560,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27560, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12644,18 +7204,8 @@ static void inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27617,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27617, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12665,18 +7215,8 @@ static void inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27561,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27561, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12691,18 +7231,8 @@ static void inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27615,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27615, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12712,18 +7242,8 @@ static void inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27559,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27559, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12738,18 +7258,8 @@ static void inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27618,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27618, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12759,18 +7269,8 @@ static void inverted_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 27562,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 27562, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -12804,11 +7304,7 @@ static void inverted_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x008A9878 */
 static void inverted_rc_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12818,18 +7314,8 @@ static void inverted_rc_track_diag_flat_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27590,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27590, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12841,18 +7327,8 @@ static void inverted_rc_track_diag_flat_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27587,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27587, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12864,18 +7340,8 @@ static void inverted_rc_track_diag_flat_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27589,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27589, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12887,26 +7353,14 @@ static void inverted_rc_track_diag_flat_to_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27588,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27588, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -12934,11 +7388,7 @@ static void inverted_rc_track_diag_flat_to_left_bank(
 
 /** rct2: 0x008A9888 */
 static void inverted_rc_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12948,18 +7398,8 @@ static void inverted_rc_track_diag_flat_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27594,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27594, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12971,18 +7411,8 @@ static void inverted_rc_track_diag_flat_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27591,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27591, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -12994,18 +7424,8 @@ static void inverted_rc_track_diag_flat_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27593,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27593, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13017,26 +7437,14 @@ static void inverted_rc_track_diag_flat_to_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27592,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27592, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -13064,11 +7472,7 @@ static void inverted_rc_track_diag_flat_to_right_bank(
 
 /** rct2: 0x008A9898 */
 static void inverted_rc_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13078,18 +7482,8 @@ static void inverted_rc_track_diag_left_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27592,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27592, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13101,18 +7495,8 @@ static void inverted_rc_track_diag_left_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27593,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27593, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13124,18 +7508,8 @@ static void inverted_rc_track_diag_left_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27591,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27591, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13147,26 +7521,14 @@ static void inverted_rc_track_diag_left_bank_to_flat(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27594,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27594, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -13194,11 +7556,7 @@ static void inverted_rc_track_diag_left_bank_to_flat(
 
 /** rct2: 0x008A98A8 */
 static void inverted_rc_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13208,18 +7566,8 @@ static void inverted_rc_track_diag_right_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27588,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27588, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13231,18 +7579,8 @@ static void inverted_rc_track_diag_right_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27589,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27589, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13254,18 +7592,8 @@ static void inverted_rc_track_diag_right_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27587,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27587, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13277,26 +7605,14 @@ static void inverted_rc_track_diag_right_bank_to_flat(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27590,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27590, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -13324,11 +7640,7 @@ static void inverted_rc_track_diag_right_bank_to_flat(
 
 /** rct2: 0x008A98D8 */
 static void inverted_rc_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13338,18 +7650,8 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27606,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27606, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13361,18 +7663,8 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27603,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27603, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13384,18 +7676,8 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27605,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27605, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13407,18 +7689,8 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27604,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27604, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -13451,11 +7723,7 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x008A98E8 */
 static void inverted_rc_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13465,18 +7733,8 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27610,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27610, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13488,18 +7746,8 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27607,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27607, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13511,18 +7759,8 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27609,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27609, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13534,18 +7772,8 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27608,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27608, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -13578,11 +7806,7 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x008A98B8 */
 static void inverted_rc_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13592,18 +7816,8 @@ static void inverted_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27598,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27598, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13615,18 +7829,8 @@ static void inverted_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27595,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27595, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13638,18 +7842,8 @@ static void inverted_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27597,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27597, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13661,18 +7855,8 @@ static void inverted_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27596,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27596, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -13705,11 +7889,7 @@ static void inverted_rc_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x008A98C8 */
 static void inverted_rc_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13719,18 +7899,8 @@ static void inverted_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27602,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27602, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13742,18 +7912,8 @@ static void inverted_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27599,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27599, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13765,18 +7925,8 @@ static void inverted_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27601,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27601, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13788,18 +7938,8 @@ static void inverted_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27600,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27600, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -13832,11 +7972,7 @@ static void inverted_rc_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x008A98F8 */
 static void inverted_rc_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13846,18 +7982,8 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27600,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27600, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13868,18 +7994,8 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27601,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27601, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13890,18 +8006,8 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27599,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27599, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13912,18 +8018,8 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27602,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27602, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -13956,11 +8052,7 @@ static void inverted_rc_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x008A9908 */
 static void inverted_rc_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13970,18 +8062,8 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27596,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27596, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -13992,18 +8074,8 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27597,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27597, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14014,18 +8086,8 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27595,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27595, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14036,18 +8098,8 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27598,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27598, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -14080,11 +8132,7 @@ static void inverted_rc_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x008A9918 */
 static void inverted_rc_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14094,18 +8142,8 @@ static void inverted_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27608,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27608, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14117,18 +8155,8 @@ static void inverted_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27609,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27609, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14140,18 +8168,8 @@ static void inverted_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27607,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27607, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14163,18 +8181,8 @@ static void inverted_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27610,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27610, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -14207,11 +8215,7 @@ static void inverted_rc_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x008A9928 */
 static void inverted_rc_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14221,18 +8225,8 @@ static void inverted_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27604,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27604, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14244,18 +8238,8 @@ static void inverted_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27605,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27605, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14267,18 +8251,8 @@ static void inverted_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27603,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27603, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14290,18 +8264,8 @@ static void inverted_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27606,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 37);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27606, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 37);
                     break;
             }
 
@@ -14334,11 +8298,7 @@ static void inverted_rc_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x008A9858 */
 static void inverted_rc_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14348,18 +8308,8 @@ static void inverted_rc_track_diag_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27586,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27586, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14371,18 +8321,8 @@ static void inverted_rc_track_diag_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27583,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27583, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14394,18 +8334,8 @@ static void inverted_rc_track_diag_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27585,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27585, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14417,26 +8347,14 @@ static void inverted_rc_track_diag_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27584,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27584, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -14464,11 +8382,7 @@ static void inverted_rc_track_diag_left_bank(
 
 /** rct2: 0x008A9868 */
 static void inverted_rc_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14478,18 +8392,8 @@ static void inverted_rc_track_diag_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27584,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27584, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14501,18 +8405,8 @@ static void inverted_rc_track_diag_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27585,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27585, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14524,18 +8418,8 @@ static void inverted_rc_track_diag_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27583,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27583, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -14547,26 +8431,14 @@ static void inverted_rc_track_diag_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27586,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27586, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -14594,11 +8466,7 @@ static void inverted_rc_track_diag_right_bank(
 
 /** rct2: 0x008A9978 */
 static void inverted_rc_track_left_large_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14608,62 +8476,22 @@ static void inverted_rc_track_left_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27639,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27639, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27646,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27646, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27653,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27653, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27660,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27660, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 29);
                     break;
             }
@@ -14680,62 +8508,22 @@ static void inverted_rc_track_left_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27640,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27640, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27647,
-                        0,
-                        0,
-                        32,
-                        20,
-                        9,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27647, 0, 0, 32, 20, 9, height, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27654,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27654, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27661,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27661, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 29);
                     break;
             }
@@ -14748,17 +8536,7 @@ static void inverted_rc_track_left_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27641,
-                        0,
-                        0,
-                        24,
-                        16,
-                        3,
-                        height,
-                        8,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27641, 0, 0, 24, 16, 3, height, 8, 0,
                         height + 40);
                     break;
                 case 1:
@@ -14767,32 +8545,12 @@ static void inverted_rc_track_left_large_half_loop_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27655,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27655, 0, 0, 32, 16, 0, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27662,
-                        0,
-                        0,
-                        2,
-                        16,
-                        3,
-                        height,
-                        30,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27662, 0, 0, 2, 16, 3, height, 30, 16,
                         height + 70);
                     break;
             }
@@ -14800,8 +8558,7 @@ static void inverted_rc_track_left_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 3:
@@ -14809,17 +8566,7 @@ static void inverted_rc_track_left_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27642,
-                        0,
-                        0,
-                        8,
-                        16,
-                        3,
-                        height,
-                        24,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27642, 0, 0, 8, 16, 3, height, 24, 0,
                         height + 29);
                     break;
                 case 1:
@@ -14828,32 +8575,12 @@ static void inverted_rc_track_left_large_half_loop_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27656,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27656, 0, 0, 32, 16, 0, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27663,
-                        0,
-                        0,
-                        2,
-                        16,
-                        3,
-                        height,
-                        30,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27663, 0, 0, 2, 16, 3, height, 30, 16,
                         height + 100);
                     break;
             }
@@ -14861,8 +8588,7 @@ static void inverted_rc_track_left_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 224, 0x20);
             break;
         case 4:
@@ -14870,32 +8596,12 @@ static void inverted_rc_track_left_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27643,
-                        0,
-                        0,
-                        2,
-                        2,
-                        3,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27643, 0, 0, 2, 2, 3, height, 30, 30,
                         height + 80);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27650,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27650, 0, 0, 16, 16, 0, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -14904,17 +8610,7 @@ static void inverted_rc_track_left_large_half_loop_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27664,
-                        0,
-                        0,
-                        2,
-                        16,
-                        3,
-                        height,
-                        30,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27664, 0, 0, 2, 16, 3, height, 30, 0,
                         height + 90);
                     break;
             }
@@ -14927,32 +8623,12 @@ static void inverted_rc_track_left_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27644,
-                        0,
-                        0,
-                        2,
-                        16,
-                        3,
-                        height,
-                        30,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27644, 0, 0, 2, 16, 3, height, 30, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27651,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27651, 0, 0, 32, 16, 0, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -14961,17 +8637,7 @@ static void inverted_rc_track_left_large_half_loop_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27665,
-                        0,
-                        0,
-                        2,
-                        16,
-                        3,
-                        height,
-                        30,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27665, 0, 0, 2, 16, 3, height, 30, 0,
                         height + 140);
                     break;
             }
@@ -14979,8 +8645,7 @@ static void inverted_rc_track_left_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 224, 0x20);
             break;
         case 6:
@@ -14988,34 +8653,14 @@ static void inverted_rc_track_left_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27645,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27645, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 32);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_BOXED, 4, 27, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27652,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27652, 0, 0, 32, 16, 0, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_BOXED, 4, 27, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -15028,17 +8673,7 @@ static void inverted_rc_track_left_large_half_loop_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27666,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27666, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 32);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_BOXED, 4, 27, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -15052,8 +8687,7 @@ static void inverted_rc_track_left_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 40, 0x20);
             break;
     }
@@ -15061,11 +8695,7 @@ static void inverted_rc_track_left_large_half_loop_up(
 
 /** rct2: 0x008A9988 */
 static void inverted_rc_track_right_large_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -15075,62 +8705,22 @@ static void inverted_rc_track_right_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27688,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27688, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27681,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27681, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27674,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27674, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27667,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27667, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 29);
                     break;
             }
@@ -15147,62 +8737,22 @@ static void inverted_rc_track_right_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27689,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27689, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27682,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27682, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27675,
-                        0,
-                        0,
-                        32,
-                        20,
-                        19,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27675, 0, 0, 32, 20, 19, height, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27668,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27668, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 29);
                     break;
             }
@@ -15215,32 +8765,12 @@ static void inverted_rc_track_right_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27690,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27690, 0, 0, 32, 16, 3, height, 0, 16,
                         height + 70);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27683,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27683, 0, 0, 32, 16, 0, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -15249,17 +8779,7 @@ static void inverted_rc_track_right_large_half_loop_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27669,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27669, 0, 0, 32, 16, 3, height, 0, 0,
                         height + 70);
                     break;
             }
@@ -15267,8 +8787,7 @@ static void inverted_rc_track_right_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 3:
@@ -15276,32 +8795,12 @@ static void inverted_rc_track_right_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27691,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27691, 0, 0, 32, 16, 3, height, 0, 16,
                         height + 100);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27684,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27684, 0, 0, 32, 16, 0, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -15310,17 +8809,7 @@ static void inverted_rc_track_right_large_half_loop_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27670,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27670, 0, 0, 32, 16, 3, height, 0, 0,
                         height + 100);
                     break;
             }
@@ -15328,8 +8817,7 @@ static void inverted_rc_track_right_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 224, 0x20);
             break;
         case 4:
@@ -15337,17 +8825,7 @@ static void inverted_rc_track_right_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27692,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27692, 0, 0, 16, 16, 3, height, 16, 0,
                         height + 90);
                     break;
                 case 1:
@@ -15356,32 +8834,12 @@ static void inverted_rc_track_right_large_half_loop_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27678,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27678, 0, 0, 16, 16, 0, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27671,
-                        0,
-                        0,
-                        2,
-                        16,
-                        3,
-                        height,
-                        30,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27671, 0, 0, 2, 16, 3, height, 30, 16,
                         height + 110);
                     break;
             }
@@ -15394,17 +8852,7 @@ static void inverted_rc_track_right_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27693,
-                        0,
-                        0,
-                        2,
-                        16,
-                        3,
-                        height,
-                        30,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27693, 0, 0, 2, 16, 3, height, 30, 0,
                         height + 140);
                     break;
                 case 1:
@@ -15413,32 +8861,12 @@ static void inverted_rc_track_right_large_half_loop_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27679,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27679, 0, 0, 32, 16, 0, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27672,
-                        0,
-                        0,
-                        2,
-                        16,
-                        3,
-                        height,
-                        30,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27672, 0, 0, 2, 16, 3, height, 30, 16,
                         height + 140);
                     break;
             }
@@ -15446,8 +8874,7 @@ static void inverted_rc_track_right_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 224, 0x20);
             break;
         case 6:
@@ -15455,17 +8882,7 @@ static void inverted_rc_track_right_large_half_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27694,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27694, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 32);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_BOXED, 4, 27, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -15478,34 +8895,14 @@ static void inverted_rc_track_right_large_half_loop_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27680,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27680, 0, 0, 32, 16, 0, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_BOXED, 4, 27, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27673,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27673, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 32);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_BOXED, 4, 27, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -15519,8 +8916,7 @@ static void inverted_rc_track_right_large_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 40, 0x20);
             break;
     }
@@ -15528,11 +8924,7 @@ static void inverted_rc_track_right_large_half_loop_up(
 
 /** rct2: 0x008A9998 */
 static void inverted_rc_track_right_large_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_right_large_half_loop_up(session, rideIndex, 6 - trackSequence, direction, height, tileElement);
@@ -15540,11 +8932,7 @@ static void inverted_rc_track_right_large_half_loop_down(
 
 /** rct2: 0x008A99A8 */
 static void inverted_rc_track_left_large_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_left_large_half_loop_up(session, rideIndex, 6 - trackSequence, direction, height, tileElement);
@@ -15552,11 +8940,7 @@ static void inverted_rc_track_left_large_half_loop_down(
 
 /** rct2: 0x008A96A8 */
 static void inverted_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -15564,33 +8948,13 @@ static void inverted_rc_track_block_brakes(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27337,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27337, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27338,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27338, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -15608,11 +8972,7 @@ static void inverted_rc_track_block_brakes(
 
 /** rct2: 0x008A9A78 */
 static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -15639,10 +8999,8 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 52, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -15680,10 +9038,8 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 52, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -15703,11 +9059,7 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A9A88 */
 static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -15734,10 +9086,8 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 52, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -15775,10 +9125,8 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 52, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -15798,11 +9146,7 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A9A98 */
 static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -15812,11 +9156,7 @@ static void inverted_rc_track_left_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A9AA8 */
 static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -15826,11 +9166,7 @@ static void inverted_rc_track_right_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A9BB8 */
 static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -15857,10 +9193,8 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -15897,8 +9231,7 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 3:
@@ -15952,8 +9285,7 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 6:
@@ -15978,10 +9310,8 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -16001,11 +9331,7 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A9BC8 */
 static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -16032,10 +9358,8 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -16072,8 +9396,7 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 3:
@@ -16127,8 +9450,7 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 6:
@@ -16153,10 +9475,8 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -16176,11 +9496,7 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A9BD8 */
 static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -16190,11 +9506,7 @@ static void inverted_rc_track_left_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A9BE8 */
 static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -16204,73 +9516,29 @@ static void inverted_rc_track_right_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A9AB8 */
 static void inverted_rc_track_25_deg_up_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27719,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27719, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27720,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27720, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27721,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27721, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27722,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27722, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
     }
@@ -16313,73 +9581,29 @@ static void inverted_rc_track_25_deg_up_to_left_banked_25_deg_up(
 
 /** rct2: 0x008A9AC8 */
 static void inverted_rc_track_25_deg_up_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27723,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27723, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27724,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27724, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27725,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27725, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27726,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27726, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
     }
@@ -16422,73 +9646,29 @@ static void inverted_rc_track_25_deg_up_to_right_banked_25_deg_up(
 
 /** rct2: 0x008A9AD8 */
 static void inverted_rc_track_left_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27727,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27727, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27728,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27728, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27729,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27729, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27730,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27730, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
     }
@@ -16531,73 +9711,29 @@ static void inverted_rc_track_left_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A9AE8 */
 static void inverted_rc_track_right_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27731,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27731, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27732,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27732, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27733,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27733, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27734,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27734, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 45);
             break;
     }
@@ -16640,11 +9776,7 @@ static void inverted_rc_track_right_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A9AF8 */
 static void inverted_rc_track_25_deg_down_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_right_banked_25_deg_up_to_25_deg_up(
@@ -16653,11 +9785,7 @@ static void inverted_rc_track_25_deg_down_to_left_banked_25_deg_down(
 
 /** rct2: 0x008A9B08 */
 static void inverted_rc_track_25_deg_down_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_left_banked_25_deg_up_to_25_deg_up(
@@ -16666,11 +9794,7 @@ static void inverted_rc_track_25_deg_down_to_right_banked_25_deg_down(
 
 /** rct2: 0x008A9B18 */
 static void inverted_rc_track_left_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_25_deg_up_to_right_banked_25_deg_up(
@@ -16679,11 +9803,7 @@ static void inverted_rc_track_left_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A9B28 */
 static void inverted_rc_track_right_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_25_deg_up_to_left_banked_25_deg_up(
@@ -16692,73 +9812,29 @@ static void inverted_rc_track_right_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A9B38 */
 static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27735,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27735, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27736,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27736, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27737,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27737, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27738,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27738, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -16801,73 +9877,29 @@ static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x008A9B48 */
 static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27739,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27739, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27740,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27740, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27741,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27741, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27742,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27742, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -16910,73 +9942,29 @@ static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x008A9B58 */
 static void inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27743,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27743, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27744,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27744, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27745,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27745, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27746,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27746, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -17019,73 +10007,29 @@ static void inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat(
 
 /** rct2: 0x008A9B68 */
 static void inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27747,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27747, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27748,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27748, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27749,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27749, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27750,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27750, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -17128,11 +10072,7 @@ static void inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat(
 
 /** rct2: 0x008A9B78 */
 static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_right_banked_25_deg_up_to_right_banked_flat(
@@ -17141,11 +10081,7 @@ static void inverted_rc_track_left_banked_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x008A9B88 */
 static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_left_banked_25_deg_up_to_left_banked_flat(
@@ -17154,11 +10090,7 @@ static void inverted_rc_track_right_banked_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x008A9B98 */
 static void inverted_rc_track_left_banked_25_deg_down_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_right_banked_flat_to_right_banked_25_deg_up(
@@ -17167,11 +10099,7 @@ static void inverted_rc_track_left_banked_25_deg_down_to_left_banked_flat(
 
 /** rct2: 0x008A9BA8 */
 static void inverted_rc_track_right_banked_25_deg_down_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_left_banked_flat_to_left_banked_25_deg_up(
@@ -17180,73 +10108,29 @@ static void inverted_rc_track_right_banked_25_deg_down_to_right_banked_flat(
 
 /** rct2: 0x008A99B8 */
 static void inverted_rc_track_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27695,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27695, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27696,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27696, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27697,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27697, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27698,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27698, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -17289,73 +10173,29 @@ static void inverted_rc_track_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x008A99C8 */
 static void inverted_rc_track_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27699,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27699, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27700,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27700, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27701,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27701, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27702,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27702, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -17398,73 +10238,29 @@ static void inverted_rc_track_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x008A99D8 */
 static void inverted_rc_track_left_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27703,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27703, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27704,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27704, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27705,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27705, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27706,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27706, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -17507,73 +10303,29 @@ static void inverted_rc_track_left_banked_25_deg_up_to_flat(
 
 /** rct2: 0x008A99E8 */
 static void inverted_rc_track_right_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27707,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27707, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27708,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27708, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27709,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27709, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 27710,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 27710, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 37);
             break;
     }
@@ -17616,11 +10368,7 @@ static void inverted_rc_track_right_banked_25_deg_up_to_flat(
 
 /** rct2: 0x008A99F8 */
 static void inverted_rc_track_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_right_banked_25_deg_up_to_flat(
@@ -17629,11 +10377,7 @@ static void inverted_rc_track_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x008A9A08 */
 static void inverted_rc_track_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_left_banked_25_deg_up_to_flat(
@@ -17642,11 +10386,7 @@ static void inverted_rc_track_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x008A9A18 */
 static void inverted_rc_track_left_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_flat_to_right_banked_25_deg_up(
@@ -17655,11 +10395,7 @@ static void inverted_rc_track_left_banked_25_deg_down_to_flat(
 
 /** rct2: 0x008A9A28 */
 static void inverted_rc_track_right_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     inverted_rc_track_flat_to_left_banked_25_deg_up(
diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp
index 12ce77a7d0..03042afc89 100644
--- a/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.cpp
@@ -640,9 +640,7 @@ enum
 
 static constexpr const uint32_t junior_rc_track_pieces_flat[3][4] = {
     { SPR_JUNIOR_RC_FLAT_SW_NE, SPR_JUNIOR_RC_FLAT_NW_SE, SPR_JUNIOR_RC_FLAT_SW_NE, SPR_JUNIOR_RC_FLAT_NW_SE },
-    { SPR_JUNIOR_RC_FLAT_CHAIN_SW_NE,
-      SPR_JUNIOR_RC_FLAT_CHAIN_NW_SE,
-      SPR_JUNIOR_RC_FLAT_CHAIN_SW_NE,
+    { SPR_JUNIOR_RC_FLAT_CHAIN_SW_NE, SPR_JUNIOR_RC_FLAT_CHAIN_NW_SE, SPR_JUNIOR_RC_FLAT_CHAIN_SW_NE,
       SPR_JUNIOR_RC_FLAT_CHAIN_NW_SE },
     {
         SPR_WATER_RC_FLAT_CHAIN_SW_NE,
@@ -653,29 +651,21 @@ static constexpr const uint32_t junior_rc_track_pieces_flat[3][4] = {
 };
 
 static constexpr const uint32_t junior_rc_track_pieces_block_brake[2][4] = {
-    { SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE,
-      SPR_JUNIOR_RC_FLAT_BLOCK_NW_SE,
-      SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE,
+    { SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE, SPR_JUNIOR_RC_FLAT_BLOCK_NW_SE, SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE,
       SPR_JUNIOR_RC_FLAT_BLOCK_NW_SE },
-    { SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE_BRAKED,
-      SPR_JUNIOR_RC_FLAT_BLOCK_NW_SE_BRAKED,
-      SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE_BRAKED,
+    { SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE_BRAKED, SPR_JUNIOR_RC_FLAT_BLOCK_NW_SE_BRAKED, SPR_JUNIOR_RC_FLAT_BLOCK_SW_NE_BRAKED,
       SPR_JUNIOR_RC_FLAT_BLOCK_NW_SE_BRAKED },
 };
 
 static constexpr const uint32_t junior_rc_track_pieces_station[2][4] = {
     { SPR_JUNIOR_RC_STATION_SW_NE, SPR_JUNIOR_RC_STATION_NW_SE, SPR_JUNIOR_RC_STATION_SW_NE, SPR_JUNIOR_RC_STATION_NW_SE },
-    { SPR_JUNIOR_RC_FLAT_SW_NE_BRAKED,
-      SPR_JUNIOR_RC_FLAT_NW_SE_BRAKED,
-      SPR_JUNIOR_RC_FLAT_SW_NE_BRAKED,
+    { SPR_JUNIOR_RC_FLAT_SW_NE_BRAKED, SPR_JUNIOR_RC_FLAT_NW_SE_BRAKED, SPR_JUNIOR_RC_FLAT_SW_NE_BRAKED,
       SPR_JUNIOR_RC_FLAT_NW_SE_BRAKED },
 };
 
 static constexpr const uint32_t junior_rc_track_pieces_25_deg_up[3][4] = {
     { SPR_JUNIOR_RC_25_DEG_SW_NE, SPR_JUNIOR_RC_25_DEG_NW_SE, SPR_JUNIOR_RC_25_DEG_NE_SW, SPR_JUNIOR_RC_25_DEG_SE_NW },
-    { SPR_JUNIOR_RC_25_DEG_CHAIN_SW_NE,
-      SPR_JUNIOR_RC_25_DEG_CHAIN_NW_SE,
-      SPR_JUNIOR_RC_25_DEG_CHAIN_NE_SW,
+    { SPR_JUNIOR_RC_25_DEG_CHAIN_SW_NE, SPR_JUNIOR_RC_25_DEG_CHAIN_NW_SE, SPR_JUNIOR_RC_25_DEG_CHAIN_NE_SW,
       SPR_JUNIOR_RC_25_DEG_CHAIN_SE_NW },
     {
         SPR_WATER_RC_25_DEG_CHAIN_SW_NE,
@@ -686,14 +676,10 @@ static constexpr const uint32_t junior_rc_track_pieces_25_deg_up[3][4] = {
 };
 
 static constexpr const uint32_t junior_rc_track_pieces_flat_to_25_deg_up[3][4] = {
-    { SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_SW_NE,
-      SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_NW_SE,
-      SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_NE_SW,
+    { SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_SW_NE, SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_NW_SE, SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_NE_SW,
       SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_SE_NW },
-    { SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_CHAIN_SW_NE,
-      SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_CHAIN_NW_SE,
-      SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_CHAIN_NE_SW,
-      SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_CHAIN_SE_NW },
+    { SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_CHAIN_SW_NE, SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_CHAIN_NW_SE,
+      SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_CHAIN_NE_SW, SPR_JUNIOR_RC_FLAT_TO_25_DEG_UP_CHAIN_SE_NW },
     {
         SPR_WATER_RC_FLAT_TO_25_DEG_UP_CHAIN_SW_NE,
         SPR_WATER_RC_FLAT_TO_25_DEG_UP_CHAIN_NW_SE,
@@ -703,14 +689,10 @@ static constexpr const uint32_t junior_rc_track_pieces_flat_to_25_deg_up[3][4] =
 };
 
 static constexpr const uint32_t junior_rc_track_pieces_25_deg_up_to_flat[3][4] = {
-    { SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_SW_NE,
-      SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_NW_SE,
-      SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_NE_SW,
+    { SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_SW_NE, SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_NW_SE, SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_NE_SW,
       SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_SE_NW },
-    { SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_CHAIN_SW_NE,
-      SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_CHAIN_NW_SE,
-      SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_CHAIN_NE_SW,
-      SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_CHAIN_SE_NW },
+    { SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_CHAIN_SW_NE, SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_CHAIN_NW_SE,
+      SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_CHAIN_NE_SW, SPR_JUNIOR_RC_25_DEG_UP_TO_FLAT_CHAIN_SE_NW },
     {
         SPR_WATER_RC_25_DEG_UP_TO_FLAT_CHAIN_SW_NE,
         SPR_WATER_RC_25_DEG_UP_TO_FLAT_CHAIN_NW_SE,
@@ -1638,13 +1620,8 @@ static constexpr const uint32_t junior_rc_track_pieces_diag_60_deg_down_to_25_de
 // clang-format on
 
 void junior_rc_paint_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     uint32_t imageId = junior_rc_track_pieces_flat[chainType][direction] | session->TrackColours[SCHEME_TRACK];
     sub_98196C_rotated(session, direction, imageId, 0, 6, 32, 20, 1, height);
@@ -1653,11 +1630,7 @@ void junior_rc_paint_track_flat(
     if (track_paint_util_should_paint_supports(session->MapPosition))
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            4,
-            0,
-            height,
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -1667,13 +1640,8 @@ void junior_rc_paint_track_flat(
 }
 
 void junior_rc_paint_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    uint8_t rideType)
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, uint8_t rideType)
 {
     uint32_t imageId;
 
@@ -1730,13 +1698,8 @@ void junior_rc_paint_station(
 }
 
 void junior_rc_paint_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     uint32_t imageId = junior_rc_track_pieces_25_deg_up[chainType][direction] | session->TrackColours[SCHEME_TRACK];
     sub_98196C_rotated(session, direction, imageId, 0, 6, 32, 20, 1, height);
@@ -1757,13 +1720,8 @@ void junior_rc_paint_track_25_deg_up(
 }
 
 void junior_rc_paint_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     uint32_t imageId = junior_rc_track_pieces_flat_to_25_deg_up[chainType][direction] | session->TrackColours[SCHEME_TRACK];
 
@@ -1790,13 +1748,8 @@ void junior_rc_paint_track_flat_to_25_deg_up(
 }
 
 void junior_rc_paint_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     uint32_t imageId = junior_rc_track_pieces_25_deg_up_to_flat[chainType][direction] | session->TrackColours[SCHEME_TRACK];
     sub_98196C_rotated(session, direction, imageId, 0, 6, 32, 20, 1, height);
@@ -1842,44 +1795,25 @@ static constexpr const int8_t junior_rc_track_right_quarter_turn_5_tiles_support
 };
 
 static void junior_rc_right_quarter_turn_5_tiles_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_right_quarter_turn_5_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_flat_quarter_turn_5_tiles,
-        defaultRightQuarterTurn5TilesOffsets,
-        defaultRightQuarterTurn5TilesBoundLengths,
-        defaultRightQuarterTurn5TilesBoundOffsets);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_flat_quarter_turn_5_tiles, defaultRightQuarterTurn5TilesOffsets,
+        defaultRightQuarterTurn5TilesBoundLengths, defaultRightQuarterTurn5TilesBoundOffsets);
 
     int32_t supportHeight = height + junior_rc_track_right_quarter_turn_5_tiles_support_height_offset[direction][trackSequence];
     switch (trackSequence)
     {
         case 0:
             metal_a_supports_paint_setup(
-                session,
-                (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-                4,
-                0,
-                supportHeight,
+                session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, supportHeight,
                 session->TrackColours[SCHEME_SUPPORTS]);
             break;
         case 6:
             metal_a_supports_paint_setup(
-                session,
-                (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT,
-                4,
-                0,
-                supportHeight,
+                session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, 0, supportHeight,
                 session->TrackColours[SCHEME_SUPPORTS]);
             break;
     }
@@ -1915,8 +1849,7 @@ static void junior_rc_right_quarter_turn_5_tiles_paint_setup(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
@@ -1927,8 +1860,7 @@ static void junior_rc_right_quarter_turn_5_tiles_paint_setup(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D4 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 6:
             paint_util_set_segment_support_height(
@@ -1943,11 +1875,7 @@ static constexpr const uint8_t junior_rc_left_quarter_turn_5_tiles_to_right_turn
 
 /* rct2: 0x0051917A */
 static void junior_rc_left_quarter_turn_5_tiles_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence];
@@ -1959,11 +1887,7 @@ static void junior_rc_left_quarter_turn_5_tiles_paint_setup(
  * rct2: 0x008AAFC0, 0x00521593, 0x005216A1, 0x005217AF, 0x00521884
  */
 static void junior_rc_flat_to_left_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t image_id;
@@ -2012,11 +1936,7 @@ static void junior_rc_flat_to_left_bank_paint_setup(
  * rct2: 0x008AAFD0, 0x00521959, 0x00521A2E, 0x00521B03, 0x00521C11
  */
 static void junior_rc_flat_to_right_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t image_id;
@@ -2062,22 +1982,14 @@ static void junior_rc_flat_to_right_bank_paint_setup(
 }
 
 static void junior_rc_left_bank_to_flat_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_flat_to_right_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
 }
 
 static void junior_rc_right_bank_to_flat_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_flat_to_left_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -2147,11 +2059,7 @@ static constexpr const LocationXYZ16 junior_rc_banked_right_quarter_turn_5_tiles
 
 /* rct2: 0x008AB010, 0x0052304C */
 static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint8_t thickness = 1;
@@ -2160,15 +2068,8 @@ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(
         thickness = 26;
     }
     track_paint_util_right_quarter_turn_5_tiles_paint(
-        session,
-        thickness,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_banked_quarter_turn_5_tiles,
-        nullptr,
-        junior_rc_banked_right_quarter_turn_5_tiles_bound_lengths,
+        session, thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_banked_quarter_turn_5_tiles, nullptr, junior_rc_banked_right_quarter_turn_5_tiles_bound_lengths,
         junior_rc_banked_right_quarter_turn_5_tiles_bound_offsets);
 
     if (direction == 1 && trackSequence == 6)
@@ -2187,20 +2088,12 @@ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(
     {
         case 0:
             metal_a_supports_paint_setup(
-                session,
-                (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-                4,
-                0,
-                supportHeight,
+                session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, supportHeight,
                 session->TrackColours[SCHEME_SUPPORTS]);
             break;
         case 6:
             metal_a_supports_paint_setup(
-                session,
-                (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT,
-                4,
-                0,
-                supportHeight,
+                session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, 0, supportHeight,
                 session->TrackColours[SCHEME_SUPPORTS]);
             break;
     }
@@ -2236,8 +2129,7 @@ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
@@ -2248,8 +2140,7 @@ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D4 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 6:
             paint_util_set_segment_support_height(
@@ -2262,11 +2153,7 @@ static void junior_rc_banked_right_quarter_turn_5_tiles_paint_setup(
 
 /* rct2: 0x008AB000 */
 static void junior_rc_banked_left_quarter_turn_5_tiles_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence];
@@ -2278,11 +2165,7 @@ static void junior_rc_banked_left_quarter_turn_5_tiles_paint_setup(
  * rct2: 0x008AB020, 0x00522073, 0x00522182, 0x00522291, 0x00522367
  */
 static void junior_rc_left_bank_to_25_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t image_id;
@@ -2343,11 +2226,7 @@ static void junior_rc_left_bank_to_25_deg_up_paint_setup(
  * rct2: 0x008AB030, 0x0052243D, 0x00522513, 0x005225E9, 0x005226F8
  */
 static void junior_rc_right_bank_to_25_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t image_id;
@@ -2408,11 +2287,7 @@ static void junior_rc_right_bank_to_25_deg_up_paint_setup(
  * rct2: 0x008AB040, 0x00522807, 0x0052291A, 0x00522A2D, 0x00522B07
  */
 static void junior_rc_25_deg_up_to_left_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t image_id;
@@ -2474,11 +2349,7 @@ static void junior_rc_25_deg_up_to_left_bank_paint_setup(
  * rct2: 0x008AB050, 0x00522BE1, 0x00522CBB, 0x00522D95, 0x00522EA8
  */
 static void junior_rc_25_deg_up_to_right_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t image_id;
@@ -2540,11 +2411,7 @@ static void junior_rc_25_deg_up_to_right_bank_paint_setup(
  * rct2: 0x008AB060
  */
 static void junior_rc_left_bank_to_25_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_25_deg_up_to_right_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -2554,11 +2421,7 @@ static void junior_rc_left_bank_to_25_deg_down_paint_setup(
  * rct2: 0x008AB070
  */
 static void junior_rc_right_bank_to_25_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_25_deg_up_to_left_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -2568,11 +2431,7 @@ static void junior_rc_right_bank_to_25_deg_down_paint_setup(
  * rct2: 0x008AB080
  */
 static void junior_rc_25_deg_down_to_left_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_right_bank_to_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -2582,11 +2441,7 @@ static void junior_rc_25_deg_down_to_left_bank_paint_setup(
  * rct2: 0x008AB090
  */
 static void junior_rc_25_deg_down_to_right_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_left_bank_to_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -2610,28 +2465,16 @@ static constexpr const LocationXY16 junior_rc_left_bank_bound_offsets[4] = {
  * rct2: 0x008AB0A0, 0x00521D1F, 0x00521DF4, 0x00521EC9, 0x00521F9E
  */
 static void junior_rc_left_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t image_id;
 
     image_id = junior_rc_track_pieces_left_bank[direction] | session->TrackColours[SCHEME_TRACK];
     sub_98197C(
-        session,
-        image_id,
-        0,
-        0,
-        junior_rc_left_bank_bound_lengths[direction].x,
-        junior_rc_left_bank_bound_lengths[direction].y,
-        (int8_t)junior_rc_left_bank_bound_lengths[direction].z,
-        height,
-        junior_rc_left_bank_bound_offsets[direction].x,
-        junior_rc_left_bank_bound_offsets[direction].y,
-        height);
+        session, image_id, 0, 0, junior_rc_left_bank_bound_lengths[direction].x, junior_rc_left_bank_bound_lengths[direction].y,
+        (int8_t)junior_rc_left_bank_bound_lengths[direction].z, height, junior_rc_left_bank_bound_offsets[direction].x,
+        junior_rc_left_bank_bound_offsets[direction].y, height);
 
     if (direction & 1)
     {
@@ -2658,56 +2501,32 @@ static void junior_rc_left_bank_paint_setup(
  * rct2: 0x008AB0B0
  */
 static void junior_rc_right_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_left_bank_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
 }
 
 void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     track_paint_util_right_quarter_turn_5_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
         junior_rc_track_pieces_left_quarter_turn_5_tiles_25_deg_up[chainType],
-        junior_rc_left_quarter_turn_5_tiles_25_deg_up_offsets,
-        defaultRightQuarterTurn5TilesBoundLengths,
-        nullptr);
+        junior_rc_left_quarter_turn_5_tiles_25_deg_up_offsets, defaultRightQuarterTurn5TilesBoundLengths, nullptr);
 
     uint8_t supportSpecial[4] = { 8, 8, 8, 3 };
     switch (trackSequence)
     {
         case 0:
             metal_a_supports_paint_setup(
-                session,
-                (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-                4,
-                (direction == 0 || direction == 3) ? 10 : 8,
-                height,
-                session->TrackColours[SCHEME_SUPPORTS]);
+                session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4,
+                (direction == 0 || direction == 3) ? 10 : 8, height, session->TrackColours[SCHEME_SUPPORTS]);
             break;
         case 6:
             metal_a_supports_paint_setup(
-                session,
-                (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT,
-                4,
-                supportSpecial[direction],
-                height,
+                session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, supportSpecial[direction], height,
                 session->TrackColours[SCHEME_SUPPORTS]);
             break;
     }
@@ -2740,8 +2559,7 @@ void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
@@ -2752,8 +2570,7 @@ void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D4 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 6:
             paint_util_set_segment_support_height(
@@ -2771,45 +2588,25 @@ void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(
 }
 
 void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     track_paint_util_right_quarter_turn_5_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_right_quarter_turn_5_tiles_25_deg_up[chainType],
-        defaultRightQuarterTurn5TilesOffsets,
-        defaultRightQuarterTurn5TilesBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_right_quarter_turn_5_tiles_25_deg_up[chainType], defaultRightQuarterTurn5TilesOffsets,
+        defaultRightQuarterTurn5TilesBoundLengths, nullptr);
 
     uint8_t supportSpecial[4] = { 11, 8, 8, 7 };
     switch (trackSequence)
     {
         case 0:
             metal_a_supports_paint_setup(
-                session,
-                (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-                4,
-                supportSpecial[direction],
-                height,
+                session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, supportSpecial[direction], height,
                 session->TrackColours[SCHEME_SUPPORTS]);
             break;
         case 6:
             metal_a_supports_paint_setup(
-                session,
-                (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT,
-                4,
-                8,
-                height,
+                session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, 8, height,
                 session->TrackColours[SCHEME_SUPPORTS]);
             break;
     }
@@ -2842,8 +2639,7 @@ void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
@@ -2854,8 +2650,7 @@ void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D4 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 6:
             paint_util_set_segment_support_height(
@@ -2874,87 +2669,49 @@ void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(
 
 /* rct2: 0x008AAE10, 0x00519D88, 0x00519DAC, 0x00519DD0, 0x00519DF4 */
 static void junior_rc_left_quarter_turn_5_tiles_25_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 /* rct2: 0x008AAE20, 0x00519E18, 0x0051A148, 0x0051A452, 0x0051A738 */
 static void junior_rc_right_quarter_turn_5_tiles_25_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 /* rct2: 0x008AAE30, 0x0051AA42, 0x0051AA68, 0x0051AA8C, 0x0051AAB0 */
 static void junior_rc_left_quarter_turn_5_tiles_25_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_right_quarter_turn_5_tiles_25_deg_up_paint_setup(
-        session,
-        rideIndex,
-        junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence],
-        (direction + 1) & 3,
-        height,
+        session, rideIndex, junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence], (direction + 1) & 3, height,
         tileElement);
 }
 
 /* rct2: 0x008AAE40, 0x0051AAD4, 0x0051AE04, 0x0051B10E, 0x0051B3F4 */
 static void junior_rc_right_quarter_turn_5_tiles_25_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_left_quarter_turn_5_tiles_25_deg_up_paint_setup(
-        session,
-        rideIndex,
-        junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence],
-        (direction - 1) & 3,
-        height,
+        session, rideIndex, junior_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence], (direction - 1) & 3, height,
         tileElement);
 }
 
 /* rct2: 0x008AAE50, 0x0051B6FE, 0x0051B946, 0x0051BB8E, 0x0051BBA8 */
 static void junior_rc_s_bend_left_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (direction == 2 || direction == 3)
@@ -3058,11 +2815,7 @@ static void junior_rc_s_bend_left_paint_setup(
 
 /* rct2: 0x008AAE60, 0x0051BBC0, 0x0051BE06, 0x0051C04E, 0x0051C068 */
 static void junior_rc_s_bend_right_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (direction == 2 || direction == 3)
@@ -3166,24 +2919,13 @@ static void junior_rc_s_bend_right_paint_setup(
 
 /** rct2: 0x008AAEB0, 0x0051C0E0, 0x0051C2C1, 0x0051C47F, 0x0051C61D */
 static void junior_rc_right_quarter_turn_3_tiles_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_right_quarter_turn_3_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_flat_quarter_turn_3_tiles,
-        defaultRightQuarterTurn3TilesOffsets,
-        defaultRightQuarterTurn3TilesBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_flat_quarter_turn_3_tiles, defaultRightQuarterTurn3TilesOffsets,
+        defaultRightQuarterTurn3TilesBoundLengths, nullptr);
     track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_0);
 
     uint8_t supportType[2][4] = { { 1, 0, 0, 2 }, { 2, 0, 0, 1 } };
@@ -3216,11 +2958,7 @@ static void junior_rc_right_quarter_turn_3_tiles_paint_setup(
 
 /** rct2: 0x008AAEA0 */
 static void junior_rc_left_quarter_turn_3_tiles_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3276,25 +3014,14 @@ static constexpr const LocationXYZ16 junior_rc_right_quarter_turn_3_tiles_bank_o
 
 /** rct2: 0x008AA0D0, 0x00523EA0, 0x005240CC, 0x0052430F, 0x00524500*/
 static void junior_rc_right_quarter_turn_3_tiles_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint8_t thickness[4][4] = { { 1, 1, 1, 1 }, { 1, 1, 1, 1 }, { 26, 1, 1, 26 }, { 1, 1, 1, 1 } };
 
     track_paint_util_right_quarter_turn_3_tiles_paint(
-        session,
-        thickness[direction][trackSequence],
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_banked_quarter_turn_3_tiles,
-        nullptr,
-        junior_rc_right_quarter_turn_3_tiles_bank_bound_lengths,
+        session, thickness[direction][trackSequence], height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_banked_quarter_turn_3_tiles, nullptr, junior_rc_right_quarter_turn_3_tiles_bank_bound_lengths,
         junior_rc_right_quarter_turn_3_tiles_bank_offsets);
     track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_0);
 
@@ -3338,13 +3065,8 @@ static void junior_rc_right_quarter_turn_3_tiles_bank_paint_setup(
 }
 
 void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     uint32_t imageId = 0;
     LocationXY16 offset = {};
@@ -3370,17 +3092,8 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(
     }
     if (imageId != 0)
         sub_98197C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            boundsLength.x,
-            boundsLength.y,
-            1,
-            height,
-            boundsOffset.x,
-            boundsOffset.y,
-            height);
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, boundsLength.x, boundsLength.y, 1, height, boundsOffset.x,
+            boundsOffset.y, height);
 
     if (direction == 0 && trackSequence == 0)
     {
@@ -3431,13 +3144,8 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(
 }
 
 void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     uint32_t imageId = 0;
     LocationXY16 offset = {};
@@ -3463,17 +3171,8 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(
     }
     if (imageId != 0)
         sub_98197C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            boundsLength.x,
-            boundsLength.y,
-            1,
-            height,
-            boundsOffset.x,
-            boundsOffset.y,
-            height);
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, boundsLength.x, boundsLength.y, 1, height, boundsOffset.x,
+            boundsOffset.y, height);
 
     if (direction == 0 && trackSequence == 0)
     {
@@ -3525,11 +3224,7 @@ void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(
 
 /** rct2: 0x008AA0C0 */
 static void junior_rc_left_quarter_turn_3_tiles_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3539,41 +3234,23 @@ static void junior_rc_left_quarter_turn_3_tiles_bank_paint_setup(
 
 /** rct2: 0x008AAED0, 0x0051C83C, 0x0051C9EC, 0x0051CB76, 0x0051CCDC*/
 static void junior_rc_right_quarter_turn_3_tiles_25_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 /** rct2: 0x008AAEF0, 0x0051CEC8, 0x0051D078, 0x0051D202, 0x0051D368*/
 static void junior_rc_right_quarter_turn_3_tiles_25_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
@@ -3581,11 +3258,7 @@ static constexpr const uint8_t junior_rc_left_quarter_turn_3_tiles_to_right_turn
 
 /** rct2: 0x008AAEC0 */
 static void junior_rc_left_quarter_turn_3_tiles_25_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = junior_rc_left_quarter_turn_3_tiles_to_right_turn_map[trackSequence];
@@ -3595,11 +3268,7 @@ static void junior_rc_left_quarter_turn_3_tiles_25_deg_up_paint_setup(
 
 /** rct2: 0x008AAEE0 */
 static void junior_rc_left_quarter_turn_3_tiles_25_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = junior_rc_left_quarter_turn_3_tiles_to_right_turn_map[trackSequence];
@@ -3609,11 +3278,7 @@ static void junior_rc_left_quarter_turn_3_tiles_25_deg_down_paint_setup(
 
 /** rct2: 0x008AB0F0, 0x0052B3A4, 0x0052B5F8, 0x0052B863, 0x0052BA78 */
 static void junior_rc_right_half_banked_helix_up_small_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const int8_t thickness[2] = { 1, 26 };
@@ -3625,35 +3290,20 @@ static void junior_rc_right_half_banked_helix_up_small_paint_setup(
         direction &= 3;
     }
     track_paint_util_right_helix_up_small_quarter_tiles_paint(
-        session,
-        thickness,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_right_half_banked_helix_up_small_quarter_tiles,
-        nullptr,
-        defaultRightHelixUpSmallQuarterBoundLengths,
-        defaultRightHelixUpSmallQuarterBoundOffsets);
+        session, thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_right_half_banked_helix_up_small_quarter_tiles, nullptr,
+        defaultRightHelixUpSmallQuarterBoundLengths, defaultRightHelixUpSmallQuarterBoundOffsets);
 
     if (trackSequence == 0)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            4,
-            2,
-            height,
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 2, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
     else if (trackSequence == 3)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT,
-            4,
-            6,
-            height,
+            session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, 6, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -3696,11 +3346,7 @@ static void junior_rc_right_half_banked_helix_up_small_paint_setup(
 
 /** rct2: 0x008AB110, 0x0052BD80, 0x0052BFD4, 0x0052C23B, 0x0052C450 */
 static void junior_rc_right_half_banked_helix_down_small_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const int8_t thickness[2] = { 1, 26 };
@@ -3712,35 +3358,20 @@ static void junior_rc_right_half_banked_helix_down_small_paint_setup(
         direction &= 3;
     }
     track_paint_util_right_helix_up_small_quarter_tiles_paint(
-        session,
-        thickness,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_right_half_banked_helix_down_small_quarter_tiles,
-        nullptr,
-        defaultRightHelixUpSmallQuarterBoundLengths,
-        defaultRightHelixUpSmallQuarterBoundOffsets);
+        session, thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_right_half_banked_helix_down_small_quarter_tiles, nullptr,
+        defaultRightHelixUpSmallQuarterBoundLengths, defaultRightHelixUpSmallQuarterBoundOffsets);
 
     if (trackSequence == 0)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            4,
-            6,
-            height,
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 6, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
     else if (trackSequence == 3)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT,
-            4,
-            2,
-            height,
+            session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, 2, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -3783,11 +3414,7 @@ static void junior_rc_right_half_banked_helix_down_small_paint_setup(
 
 /** rct2: 0x008AB0E0 */
 static void junior_rc_left_half_banked_helix_up_small_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence > 3)
@@ -3803,11 +3430,7 @@ static void junior_rc_left_half_banked_helix_up_small_paint_setup(
 
 /** rct2: 0x008AB100 */
 static void junior_rc_left_half_banked_helix_down_small_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence > 3)
@@ -3823,11 +3446,7 @@ static void junior_rc_left_half_banked_helix_down_small_paint_setup(
 
 /** rct2: 0x008AB130, 0x0052C7BC, 0x0052CB6B, 0x0052CF32, 0x0052D2B3 */
 static void junior_rc_right_half_banked_helix_up_large_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const int8_t thickness[2] = { 1, 26 };
@@ -3839,35 +3458,20 @@ static void junior_rc_right_half_banked_helix_up_large_paint_setup(
         direction &= 3;
     }
     track_paint_util_right_helix_up_large_quarter_tiles_paint(
-        session,
-        thickness,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_right_half_banked_helix_up_large_quarter_tiles,
-        nullptr,
-        defaultRightHelixUpLargeQuarterBoundLengths,
-        defaultRightHelixUpLargeQuarterBoundOffsets);
+        session, thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_right_half_banked_helix_up_large_quarter_tiles, nullptr,
+        defaultRightHelixUpLargeQuarterBoundLengths, defaultRightHelixUpLargeQuarterBoundOffsets);
 
     if (trackSequence == 0)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            4,
-            1,
-            height,
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 1, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
     else if (trackSequence == 6)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT,
-            4,
-            7,
-            height,
+            session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, 7, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -3895,18 +3499,15 @@ static void junior_rc_right_half_banked_helix_up_large_paint_setup(
     {
         case 0:
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_D4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_D4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC, direction),
+                0xFFFF, 0);
             break;
         case 2:
             paint_util_set_segment_support_height(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
@@ -3917,15 +3518,12 @@ static void junior_rc_right_half_banked_helix_up_large_paint_setup(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D4 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 6:
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_D4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_B8, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_D4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_B8, direction),
+                0xFFFF, 0);
             break;
     }
 
@@ -3934,11 +3532,7 @@ static void junior_rc_right_half_banked_helix_up_large_paint_setup(
 
 /** rct2: 0x008AB150, 0x0052D778, 0x0052DB27, 0x0052DEEA, 0x0052E26B */
 static void junior_rc_right_half_banked_helix_down_large_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const int8_t thickness[2] = { 1, 26 };
@@ -3950,35 +3544,20 @@ static void junior_rc_right_half_banked_helix_down_large_paint_setup(
         direction &= 3;
     }
     track_paint_util_right_helix_up_large_quarter_tiles_paint(
-        session,
-        thickness,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_right_half_banked_helix_down_large_quarter_tiles,
-        nullptr,
-        defaultRightHelixUpLargeQuarterBoundLengths,
-        defaultRightHelixUpLargeQuarterBoundOffsets);
+        session, thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_right_half_banked_helix_down_large_quarter_tiles, nullptr,
+        defaultRightHelixUpLargeQuarterBoundLengths, defaultRightHelixUpLargeQuarterBoundOffsets);
 
     if (trackSequence == 0)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            4,
-            7,
-            height,
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 7, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
     else if (trackSequence == 6)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT,
-            4,
-            1,
-            height,
+            session, (direction & 1) ? METAL_SUPPORTS_FORK : METAL_SUPPORTS_FORK_ALT, 4, 1, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -4006,18 +3585,15 @@ static void junior_rc_right_half_banked_helix_down_large_paint_setup(
     {
         case 0:
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_D4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_D4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC, direction),
+                0xFFFF, 0);
             break;
         case 2:
             paint_util_set_segment_support_height(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
@@ -4028,15 +3604,12 @@ static void junior_rc_right_half_banked_helix_down_large_paint_setup(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D4 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 6:
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_D4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_B8, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_D4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_B8, direction),
+                0xFFFF, 0);
             break;
     }
 
@@ -4045,11 +3618,7 @@ static void junior_rc_right_half_banked_helix_down_large_paint_setup(
 
 /** rct2: 0x008AB120 */
 static void junior_rc_left_half_banked_helix_up_large_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence > 6)
@@ -4065,11 +3634,7 @@ static void junior_rc_left_half_banked_helix_up_large_paint_setup(
 
 /** rct2: 0x008AB140 */
 static void junior_rc_left_half_banked_helix_down_large_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence > 6)
@@ -4087,11 +3652,7 @@ static void junior_rc_left_half_banked_helix_down_large_paint_setup(
  * rct2: 0x008AAF00, 0x0051851C, 0x005185D8
  */
 static void junior_rc_brake_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t image_id;
@@ -4126,11 +3687,7 @@ static void junior_rc_brake_paint_setup(
  * rct2: 0x008AB280, 0x00518694, 0x00518759
  */
 static void junior_rc_block_brake_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t image_id;
@@ -4165,34 +3722,19 @@ static void junior_rc_block_brake_paint_setup(
 
 /** rct2: 0x008AAF80 */
 static void junior_rc_left_eighth_to_diag_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_eighth_to_diag_tiles_paint(
-        session,
-        defaultEighthToDiagThickness,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_left_eight_to_diag,
-        nullptr,
-        defaultLeftEighthToDiagBoundLengths,
+        session, defaultEighthToDiagThickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_left_eight_to_diag, nullptr, defaultLeftEighthToDiagBoundLengths,
         defaultLeftEighthToDiagBoundOffsets);
 
     switch (trackSequence)
     {
         case 0:
             metal_a_supports_paint_setup(
-                session,
-                (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-                4,
-                0,
-                height,
+                session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height,
                 session->TrackColours[SCHEME_SUPPORTS]);
             break;
         case 4:
@@ -4246,34 +3788,19 @@ static void junior_rc_left_eighth_to_diag_paint_setup(
 
 /** rct2: 0x008AAF90 */
 static void junior_rc_right_eighth_to_diag_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_eighth_to_diag_tiles_paint(
-        session,
-        defaultEighthToDiagThickness,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_right_eight_to_diag,
-        nullptr,
-        defaultRightEighthToDiagBoundLengths,
+        session, defaultEighthToDiagThickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_right_eight_to_diag, nullptr, defaultRightEighthToDiagBoundLengths,
         defaultRightEighthToDiagBoundOffsets);
 
     switch (trackSequence)
     {
         case 0:
             metal_a_supports_paint_setup(
-                session,
-                (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-                4,
-                0,
-                height,
+                session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height,
                 session->TrackColours[SCHEME_SUPPORTS]);
             break;
         case 4:
@@ -4327,11 +3854,7 @@ static void junior_rc_right_eighth_to_diag_paint_setup(
 
 /** rct2: 0x008AAFA0 */
 static void junior_rc_left_eighth_to_orthogonal_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const uint8_t map[] = { 4, 2, 3, 1, 0 };
@@ -4341,11 +3864,7 @@ static void junior_rc_left_eighth_to_orthogonal_paint_setup(
 
 /** rct2: 0x008AAFB0 */
 static void junior_rc_right_eighth_to_orthogonal_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const uint8_t map[] = { 4, 2, 3, 1, 0 };
@@ -4436,34 +3955,19 @@ static constexpr const int8_t junior_rc_left_eighth_to_diag_bank_thickness[4][4]
 
 /** rct2: 0x008AB160 */
 static void junior_rc_left_eighth_to_diag_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_eighth_to_diag_tiles_paint(
-        session,
-        junior_rc_left_eighth_to_diag_bank_thickness,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_left_eight_to_diag_bank,
-        nullptr,
-        junior_rc_left_eighth_to_diag_bank_bound_lengths,
-        junior_rc_left_eighth_to_diag_bank_bound_offsets);
+        session, junior_rc_left_eighth_to_diag_bank_thickness, height, direction, trackSequence,
+        session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_left_eight_to_diag_bank, nullptr,
+        junior_rc_left_eighth_to_diag_bank_bound_lengths, junior_rc_left_eighth_to_diag_bank_bound_offsets);
 
     switch (trackSequence)
     {
         case 0:
             metal_a_supports_paint_setup(
-                session,
-                (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-                4,
-                0,
-                height,
+                session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height,
                 session->TrackColours[SCHEME_SUPPORTS]);
             break;
         case 4:
@@ -4598,34 +4102,19 @@ static constexpr const int8_t junior_rc_right_eighth_to_diag_bank_thickness[4][4
 
 /** rct2: 0x008AB170 */
 static void junior_rc_right_eighth_to_diag_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_eighth_to_diag_tiles_paint(
-        session,
-        junior_rc_right_eighth_to_diag_bank_thickness,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_right_eight_to_diag_bank,
-        nullptr,
-        junior_rc_right_eighth_to_diag_bank_bound_lengths,
-        junior_rc_right_eighth_to_diag_bank_bound_offsets);
+        session, junior_rc_right_eighth_to_diag_bank_thickness, height, direction, trackSequence,
+        session->TrackColours[SCHEME_TRACK], junior_rc_track_pieces_right_eight_to_diag_bank, nullptr,
+        junior_rc_right_eighth_to_diag_bank_bound_lengths, junior_rc_right_eighth_to_diag_bank_bound_offsets);
 
     switch (trackSequence)
     {
         case 0:
             metal_a_supports_paint_setup(
-                session,
-                (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-                4,
-                0,
-                height,
+                session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 0, height,
                 session->TrackColours[SCHEME_SUPPORTS]);
             break;
         case 4:
@@ -4679,11 +4168,7 @@ static void junior_rc_right_eighth_to_diag_bank_paint_setup(
 
 /** rct2: 0x008AB180 */
 static void junior_rc_left_eighth_to_orthogonal_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const uint8_t map[] = { 4, 2, 3, 1, 0 };
@@ -4694,11 +4179,7 @@ static void junior_rc_left_eighth_to_orthogonal_bank_paint_setup(
 
 /** rct2: 0x008AB190 */
 static void junior_rc_right_eighth_to_orthogonal_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const uint8_t map[] = { 4, 2, 3, 1, 0 };
@@ -4714,35 +4195,18 @@ static constexpr const int32_t junior_rc_diag_blocked_segments[] = { SEGMENT_C4
 static constexpr const uint8_t junior_rc_diag_support_segment[] = { 1, 0, 2, 3 };
 
 void junior_rc_paint_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_flat[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_flat[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (trackSequence == 3)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height,
-            session->TrackColours[SCHEME_SUPPORTS]);
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
+            0, height, session->TrackColours[SCHEME_SUPPORTS]);
     }
 
     int32_t blockedSegments = junior_rc_diag_blocked_segments[trackSequence];
@@ -4751,34 +4215,17 @@ void junior_rc_paint_track_diag_flat(
 }
 
 void junior_rc_paint_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_25_deg_up[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_25_deg_up[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            8,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 8, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -4788,34 +4235,17 @@ void junior_rc_paint_track_diag_25_deg_up(
 }
 
 void junior_rc_paint_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_flat_to_25_deg_up[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_flat_to_25_deg_up[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -4825,37 +4255,20 @@ void junior_rc_paint_track_diag_flat_to_25_deg_up(
 }
 
 void junior_rc_paint_track_diag_flat_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     // There is no specific chain for the Water Coaster, use the Junior RC chain instead
     chainType = std::min(JUNIOR_RC_CHAIN_FRICTION_WHEELS, chainType);
 
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_flat_to_60_deg_up[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_flat_to_60_deg_up[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height + 6,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height + 6,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -4865,34 +4278,17 @@ void junior_rc_paint_track_diag_flat_to_60_deg_up(
 }
 
 void junior_rc_paint_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_25_deg_up_to_flat[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_25_deg_up_to_flat[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            4,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 4, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -4902,37 +4298,20 @@ void junior_rc_paint_track_diag_25_deg_up_to_flat(
 }
 
 void junior_rc_paint_track_diag_60_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     // There is no specific chain for the Water Coaster, use the Junior RC chain instead
     chainType = std::min(JUNIOR_RC_CHAIN_FRICTION_WHEELS, chainType);
 
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_60_deg_up_to_flat[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_60_deg_up_to_flat[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            4,
-            height + 13,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 4, height + 13,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -4942,34 +4321,17 @@ void junior_rc_paint_track_diag_60_deg_up_to_flat(
 }
 
 void junior_rc_paint_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_25_deg_down[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_25_deg_down[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            8,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 8, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -4979,34 +4341,17 @@ void junior_rc_paint_track_diag_25_deg_down(
 }
 
 void junior_rc_paint_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_flat_to_25_deg_down[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_flat_to_25_deg_down[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            4,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 4, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -5016,37 +4361,20 @@ void junior_rc_paint_track_diag_flat_to_25_deg_down(
 }
 
 void junior_rc_paint_track_diag_flat_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     // There is no specific chain for the Water Coaster, use the Junior RC chain instead
     chainType = std::min(JUNIOR_RC_CHAIN_FRICTION_WHEELS, chainType);
 
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_flat_to_60_deg_down[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_flat_to_60_deg_down[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            4,
-            height + 7,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 4, height + 7,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -5056,34 +4384,17 @@ void junior_rc_paint_track_diag_flat_to_60_deg_down(
 }
 
 void junior_rc_paint_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_25_deg_down_to_flat[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_25_deg_down_to_flat[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -5093,37 +4404,20 @@ void junior_rc_paint_track_diag_25_deg_down_to_flat(
 }
 
 void junior_rc_paint_track_diag_60_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     // There is no specific chain for the Water Coaster, use the Junior RC chain instead
     chainType = std::min(JUNIOR_RC_CHAIN_FRICTION_WHEELS, chainType);
 
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_60_deg_down_to_flat[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_60_deg_down_to_flat[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -5134,240 +4428,129 @@ void junior_rc_paint_track_diag_60_deg_down_to_flat(
 
 /** rct2: 0x008AAF10 */
 static void junior_rc_diag_flat_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_flat(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 /** rct2: 0x008AAF40 */
 static void junior_rc_diag_25_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_25_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 /** rct2: 0x008AAF20 */
 static void junior_rc_diag_flat_to_25_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_flat_to_25_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void junior_rc_diag_flat_to_60_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_flat_to_60_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 /** rct2: 0x008AAF30 */
 static void junior_rc_diag_25_deg_up_to_flat_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_25_deg_up_to_flat(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void junior_rc_diag_60_deg_up_to_flat_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_60_deg_up_to_flat(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 /** rct2: 0x008AAF70 */
 static void junior_rc_diag_25_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_25_deg_down(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 /** rct2: 0x008AAF50 */
 static void junior_rc_diag_flat_to_25_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_flat_to_25_deg_down(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void junior_rc_diag_flat_to_60_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_flat_to_60_deg_down(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 /** rct2: 0x008AAF60 */
 static void junior_rc_diag_25_deg_down_to_flat_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_25_deg_down_to_flat(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void junior_rc_diag_60_deg_down_to_flat_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_60_deg_down_to_flat(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 /** rct2: 0x008AB1C0 */
 static void junior_rc_diag_flat_to_left_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_flat_to_left_bank,
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_flat_to_left_bank, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (direction == 0 && trackSequence == 1)
     {
@@ -5378,12 +4561,8 @@ static void junior_rc_diag_flat_to_left_bank_paint_setup(
     if (trackSequence == 3)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height,
-            session->TrackColours[SCHEME_SUPPORTS]);
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
+            0, height, session->TrackColours[SCHEME_SUPPORTS]);
     }
 
     int32_t blockedSegments = junior_rc_diag_blocked_segments[trackSequence];
@@ -5393,24 +4572,12 @@ static void junior_rc_diag_flat_to_left_bank_paint_setup(
 
 /** rct2: 0x008AB1D0 */
 static void junior_rc_diag_flat_to_right_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_flat_to_right_bank,
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_flat_to_right_bank, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (direction == 2 && trackSequence == 2)
     {
@@ -5421,12 +4588,8 @@ static void junior_rc_diag_flat_to_right_bank_paint_setup(
     if (trackSequence == 3)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height,
-            session->TrackColours[SCHEME_SUPPORTS]);
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
+            0, height, session->TrackColours[SCHEME_SUPPORTS]);
     }
 
     int32_t blockedSegments = junior_rc_diag_blocked_segments[trackSequence];
@@ -5436,24 +4599,12 @@ static void junior_rc_diag_flat_to_right_bank_paint_setup(
 
 /** rct2: 0x008AB1E0 */
 static void junior_rc_diag_left_bank_to_flat_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_left_bank_to_flat,
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_left_bank_to_flat, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (direction == 0 && trackSequence == 1)
     {
@@ -5464,12 +4615,8 @@ static void junior_rc_diag_left_bank_to_flat_paint_setup(
     if (trackSequence == 3)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height,
-            session->TrackColours[SCHEME_SUPPORTS]);
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
+            0, height, session->TrackColours[SCHEME_SUPPORTS]);
     }
 
     int32_t blockedSegments = junior_rc_diag_blocked_segments[trackSequence];
@@ -5479,24 +4626,12 @@ static void junior_rc_diag_left_bank_to_flat_paint_setup(
 
 /** rct2: 0x008AB1F0 */
 static void junior_rc_diag_right_bank_to_flat_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_right_bank_to_flat,
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_right_bank_to_flat, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (direction == 2 && trackSequence == 2)
     {
@@ -5507,12 +4642,8 @@ static void junior_rc_diag_right_bank_to_flat_paint_setup(
     if (trackSequence == 3)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height,
-            session->TrackColours[SCHEME_SUPPORTS]);
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
+            0, height, session->TrackColours[SCHEME_SUPPORTS]);
     }
 
     int32_t blockedSegments = junior_rc_diag_blocked_segments[trackSequence];
@@ -5522,24 +4653,12 @@ static void junior_rc_diag_right_bank_to_flat_paint_setup(
 
 /** rct2: 0x008AB220 */
 static void junior_rc_diag_left_bank_to_25_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_left_bank_to_25_deg_up,
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_left_bank_to_25_deg_up, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (direction == 0 && trackSequence == 1)
     {
@@ -5550,11 +4669,7 @@ static void junior_rc_diag_left_bank_to_25_deg_up_paint_setup(
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -5565,24 +4680,12 @@ static void junior_rc_diag_left_bank_to_25_deg_up_paint_setup(
 
 /** rct2: 0x008AB230 */
 static void junior_rc_diag_right_bank_to_25_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_right_bank_to_25_deg_up,
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_right_bank_to_25_deg_up, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (direction == 2 && trackSequence == 2)
     {
@@ -5593,11 +4696,7 @@ static void junior_rc_diag_right_bank_to_25_deg_up_paint_setup(
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -5608,24 +4707,12 @@ static void junior_rc_diag_right_bank_to_25_deg_up_paint_setup(
 
 /** rct2: 0x008AB200 */
 static void junior_rc_diag_25_deg_up_to_left_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_25_deg_up_to_left_bank,
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_25_deg_up_to_left_bank, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (direction == 0 && trackSequence == 1)
     {
@@ -5636,11 +4723,7 @@ static void junior_rc_diag_25_deg_up_to_left_bank_paint_setup(
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            4,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 4, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -5651,24 +4734,12 @@ static void junior_rc_diag_25_deg_up_to_left_bank_paint_setup(
 
 /** rct2: 0x008AB210 */
 static void junior_rc_diag_25_deg_up_to_right_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_25_deg_up_to_right_bank,
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_25_deg_up_to_right_bank, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (direction == 2 && trackSequence == 2)
     {
@@ -5679,11 +4750,7 @@ static void junior_rc_diag_25_deg_up_to_right_bank_paint_setup(
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            4,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 4, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -5694,24 +4761,12 @@ static void junior_rc_diag_25_deg_up_to_right_bank_paint_setup(
 
 /** rct2: 0x008AB200 */
 static void junior_rc_diag_left_bank_to_25_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_left_bank_to_25_deg_down,
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_left_bank_to_25_deg_down, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (direction == 0 && trackSequence == 1)
     {
@@ -5722,11 +4777,7 @@ static void junior_rc_diag_left_bank_to_25_deg_down_paint_setup(
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            4,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 4, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -5737,24 +4788,12 @@ static void junior_rc_diag_left_bank_to_25_deg_down_paint_setup(
 
 /** rct2: 0x008AB210 */
 static void junior_rc_diag_right_bank_to_25_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_right_bank_to_25_deg_down,
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_right_bank_to_25_deg_down, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (direction == 2 && trackSequence == 2)
     {
@@ -5765,11 +4804,7 @@ static void junior_rc_diag_right_bank_to_25_deg_down_paint_setup(
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            4,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 4, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -5780,24 +4815,12 @@ static void junior_rc_diag_right_bank_to_25_deg_down_paint_setup(
 
 /** rct2: 0x008AB220 */
 static void junior_rc_diag_25_deg_down_to_left_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_25_deg_down_to_left_bank,
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_25_deg_down_to_left_bank, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (direction == 0 && trackSequence == 1)
     {
@@ -5808,11 +4831,7 @@ static void junior_rc_diag_25_deg_down_to_left_bank_paint_setup(
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -5823,24 +4842,12 @@ static void junior_rc_diag_25_deg_down_to_left_bank_paint_setup(
 
 /** rct2: 0x008AB230 */
 static void junior_rc_diag_25_deg_down_to_right_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_25_deg_down_to_right_bank,
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_25_deg_down_to_right_bank, defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (direction == 2 && trackSequence == 2)
     {
@@ -5851,11 +4858,7 @@ static void junior_rc_diag_25_deg_down_to_right_bank_paint_setup(
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 0, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -5880,35 +4883,20 @@ static constexpr const LocationXYZ16 junior_rc_diag_right_bank_bound_offsets[4]
 
 /** rct2: 0x008AB1A0 */
 static void junior_rc_diag_left_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint8_t thickness = direction == 0 ? 0 : 1;
     track_paint_util_diag_tiles_paint(
-        session,
-        thickness,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_left_bank,
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
+        session, thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_left_bank, defaultDiagTileOffsets, defaultDiagBoundLengths,
         junior_rc_diag_left_bank_bound_offsets);
 
     if (trackSequence == 3)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height,
-            session->TrackColours[SCHEME_SUPPORTS]);
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
+            0, height, session->TrackColours[SCHEME_SUPPORTS]);
     }
 
     int32_t blockedSegments = junior_rc_diag_blocked_segments[trackSequence];
@@ -5918,35 +4906,20 @@ static void junior_rc_diag_left_bank_paint_setup(
 
 /** rct2: 0x008AB1B0 */
 static void junior_rc_diag_right_bank_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint8_t thickness = direction == 2 ? 0 : 1;
     track_paint_util_diag_tiles_paint(
-        session,
-        thickness,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_right_bank,
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
+        session, thickness, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_right_bank, defaultDiagTileOffsets, defaultDiagBoundLengths,
         junior_rc_diag_right_bank_bound_offsets);
 
     if (trackSequence == 3)
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            junior_rc_diag_support_segment[direction],
-            0,
-            height,
-            session->TrackColours[SCHEME_SUPPORTS]);
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, junior_rc_diag_support_segment[direction],
+            0, height, session->TrackColours[SCHEME_SUPPORTS]);
     }
 
     int32_t blockedSegments = junior_rc_diag_blocked_segments[trackSequence];
@@ -5978,30 +4951,18 @@ static constexpr const LocationXY16 junior_rc_60_deg_up_bound_lengths[4] = {
 };
 
 void junior_rc_paint_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     uint32_t image_id = session->TrackColours[SCHEME_TRACK];
 
     image_id |= junior_rc_track_pieces_60_deg_up[chainType][direction];
 
     sub_98197C(
-        session,
-        image_id,
-        (int8_t)junior_rc_60_deg_up_tile_offsets[direction].x,
-        (int8_t)junior_rc_60_deg_up_tile_offsets[direction].y,
-        junior_rc_60_deg_up_bound_lengths[direction].x,
-        junior_rc_60_deg_up_bound_lengths[direction].y,
-        junior_rc_60_deg_up_bound_thickness[direction],
-        height,
-        junior_rc_60_deg_up_bound_offsets[direction].x,
-        junior_rc_60_deg_up_bound_offsets[direction].y,
-        height);
+        session, image_id, (int8_t)junior_rc_60_deg_up_tile_offsets[direction].x,
+        (int8_t)junior_rc_60_deg_up_tile_offsets[direction].y, junior_rc_60_deg_up_bound_lengths[direction].x,
+        junior_rc_60_deg_up_bound_lengths[direction].y, junior_rc_60_deg_up_bound_thickness[direction], height,
+        junior_rc_60_deg_up_bound_offsets[direction].x, junior_rc_60_deg_up_bound_offsets[direction].y, height);
 
     switch (direction)
     {
@@ -6025,11 +4986,7 @@ void junior_rc_paint_track_60_deg_up(
     if (track_paint_util_should_paint_supports(pos))
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            4,
-            support[direction],
-            height,
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, support[direction], height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -6039,30 +4996,17 @@ void junior_rc_paint_track_60_deg_up(
 }
 
 static void junior_rc_60_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_60_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void junior_rc_60_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_60_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -6085,30 +5029,20 @@ static constexpr const LocationXY16 junior_rc_25_deg_up_to_60_deg_up_bound_offse
 };
 
 void junior_rc_paint_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     uint32_t image_id = session->TrackColours[SCHEME_TRACK];
 
     image_id |= junior_rc_track_pieces_25_deg_up_to_60_deg_up[chainType][direction][0];
 
     sub_98197C(
-        session,
-        image_id,
-        (int8_t)junior_rc_60_deg_up_tile_offsets[direction].x,
-        (int8_t)junior_rc_60_deg_up_tile_offsets[direction].y,
-        junior_rc_25_deg_up_to_60_deg_up_bound_lengths[direction][0].x,
+        session, image_id, (int8_t)junior_rc_60_deg_up_tile_offsets[direction].x,
+        (int8_t)junior_rc_60_deg_up_tile_offsets[direction].y, junior_rc_25_deg_up_to_60_deg_up_bound_lengths[direction][0].x,
         junior_rc_25_deg_up_to_60_deg_up_bound_lengths[direction][0].y,
-        junior_rc_25_deg_up_to_60_deg_up_bound_thickness[direction],
-        height,
+        junior_rc_25_deg_up_to_60_deg_up_bound_thickness[direction], height,
         junior_rc_25_deg_up_to_60_deg_up_bound_offsets[direction][0].x,
-        junior_rc_25_deg_up_to_60_deg_up_bound_offsets[direction][0].y,
-        height);
+        junior_rc_25_deg_up_to_60_deg_up_bound_offsets[direction][0].y, height);
 
     if (junior_rc_track_pieces_25_deg_up_to_60_deg_up[chainType][direction][1] != 0)
     {
@@ -6117,17 +5051,13 @@ void junior_rc_paint_track_25_deg_up_to_60_deg_up(
         image_id |= junior_rc_track_pieces_25_deg_up_to_60_deg_up[chainType][direction][1];
 
         sub_98197C(
-            session,
-            image_id,
-            (int8_t)junior_rc_60_deg_up_tile_offsets[direction].x,
+            session, image_id, (int8_t)junior_rc_60_deg_up_tile_offsets[direction].x,
             (int8_t)junior_rc_60_deg_up_tile_offsets[direction].y,
             junior_rc_25_deg_up_to_60_deg_up_bound_lengths[direction][1].x,
             junior_rc_25_deg_up_to_60_deg_up_bound_lengths[direction][1].y,
-            junior_rc_25_deg_up_to_60_deg_up_bound_thickness[direction],
-            height,
+            junior_rc_25_deg_up_to_60_deg_up_bound_thickness[direction], height,
             junior_rc_25_deg_up_to_60_deg_up_bound_offsets[direction][1].x,
-            junior_rc_25_deg_up_to_60_deg_up_bound_offsets[direction][1].y,
-            height);
+            junior_rc_25_deg_up_to_60_deg_up_bound_offsets[direction][1].y, height);
     }
 
     switch (direction)
@@ -6152,11 +5082,7 @@ void junior_rc_paint_track_25_deg_up_to_60_deg_up(
     if (track_paint_util_should_paint_supports(pos))
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            4,
-            support[direction],
-            height,
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, support[direction], height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -6166,60 +5092,37 @@ void junior_rc_paint_track_25_deg_up_to_60_deg_up(
 }
 
 static void junior_rc_25_deg_up_to_60_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_25_deg_up_to_60_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void junior_rc_60_deg_down_to_25_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_25_deg_up_to_60_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
 }
 
 void junior_rc_paint_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     uint32_t image_id = session->TrackColours[SCHEME_TRACK];
 
     image_id |= junior_rc_track_pieces_60_deg_up_to_25_deg_up[chainType][direction][0];
 
     sub_98197C(
-        session,
-        image_id,
-        (int8_t)junior_rc_60_deg_up_tile_offsets[direction].x,
-        (int8_t)junior_rc_60_deg_up_tile_offsets[direction].y,
-        junior_rc_25_deg_up_to_60_deg_up_bound_lengths[direction][0].x,
+        session, image_id, (int8_t)junior_rc_60_deg_up_tile_offsets[direction].x,
+        (int8_t)junior_rc_60_deg_up_tile_offsets[direction].y, junior_rc_25_deg_up_to_60_deg_up_bound_lengths[direction][0].x,
         junior_rc_25_deg_up_to_60_deg_up_bound_lengths[direction][0].y,
-        junior_rc_25_deg_up_to_60_deg_up_bound_thickness[direction],
-        height,
+        junior_rc_25_deg_up_to_60_deg_up_bound_thickness[direction], height,
         junior_rc_25_deg_up_to_60_deg_up_bound_offsets[direction][0].x,
-        junior_rc_25_deg_up_to_60_deg_up_bound_offsets[direction][0].y,
-        height);
+        junior_rc_25_deg_up_to_60_deg_up_bound_offsets[direction][0].y, height);
 
     if (junior_rc_track_pieces_60_deg_up_to_25_deg_up[chainType][direction][1] != 0)
     {
@@ -6228,17 +5131,13 @@ void junior_rc_paint_track_60_deg_up_to_25_deg_up(
         image_id |= junior_rc_track_pieces_60_deg_up_to_25_deg_up[chainType][direction][1];
 
         sub_98197C(
-            session,
-            image_id,
-            (int8_t)junior_rc_60_deg_up_tile_offsets[direction].x,
+            session, image_id, (int8_t)junior_rc_60_deg_up_tile_offsets[direction].x,
             (int8_t)junior_rc_60_deg_up_tile_offsets[direction].y,
             junior_rc_25_deg_up_to_60_deg_up_bound_lengths[direction][1].x,
             junior_rc_25_deg_up_to_60_deg_up_bound_lengths[direction][1].y,
-            junior_rc_25_deg_up_to_60_deg_up_bound_thickness[direction],
-            height,
+            junior_rc_25_deg_up_to_60_deg_up_bound_thickness[direction], height,
             junior_rc_25_deg_up_to_60_deg_up_bound_offsets[direction][1].x,
-            junior_rc_25_deg_up_to_60_deg_up_bound_offsets[direction][1].y,
-            height);
+            junior_rc_25_deg_up_to_60_deg_up_bound_offsets[direction][1].y, height);
     }
 
     switch (direction)
@@ -6262,11 +5161,7 @@ void junior_rc_paint_track_60_deg_up_to_25_deg_up(
     if (track_paint_util_should_paint_supports(pos))
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            4,
-            20,
-            height,
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 20, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -6276,64 +5171,34 @@ void junior_rc_paint_track_60_deg_up_to_25_deg_up(
 }
 
 static void junior_rc_60_deg_up_to_25_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_60_deg_up_to_25_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void junior_rc_25_deg_down_to_60_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_60_deg_up_to_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
 }
 
 void junior_rc_paint_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_60_deg_up[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_60_deg_up[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            36,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 36, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -6343,34 +5208,17 @@ void junior_rc_paint_track_diag_60_deg_up(
 }
 
 void junior_rc_paint_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_60_deg_down[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
-        nullptr);
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_60_deg_down[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths, nullptr);
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            28,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 28, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -6380,34 +5228,18 @@ void junior_rc_paint_track_diag_60_deg_down(
 }
 
 void junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_25_deg_up_to_60_deg_up[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_25_deg_up_to_60_deg_up[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths,
         nullptr);
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            16,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 16, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -6417,52 +5249,28 @@ void junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(
 }
 
 void junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     if (direction == 1 && trackSequence == 3)
     {
         sub_98197C(
             session,
-            junior_rc_track_pieces_diag_60_deg_up_to_25_deg_up[chainType][direction] | session->TrackColours[SCHEME_TRACK],
-            -16,
-            -16,
-            16,
-            16,
-            1,
-            height,
-            0,
-            0,
-            height);
+            junior_rc_track_pieces_diag_60_deg_up_to_25_deg_up[chainType][direction] | session->TrackColours[SCHEME_TRACK], -16,
+            -16, 16, 16, 1, height, 0, 0, height);
     }
     else
     {
         track_paint_util_diag_tiles_paint(
-            session,
-            1,
-            height,
-            direction,
-            trackSequence,
-            session->TrackColours[SCHEME_TRACK],
-            junior_rc_track_pieces_diag_60_deg_up_to_25_deg_up[chainType],
-            defaultDiagTileOffsets,
-            defaultDiagBoundLengths,
+            session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+            junior_rc_track_pieces_diag_60_deg_up_to_25_deg_up[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths,
             nullptr);
     }
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            21,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 21, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -6472,52 +5280,28 @@ void junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(
 }
 
 void junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     if (direction == 3 && trackSequence == 0)
     {
         sub_98197C(
             session,
             junior_rc_track_pieces_diag_25_deg_down_to_60_deg_down[chainType][direction] | session->TrackColours[SCHEME_TRACK],
-            -16,
-            -16,
-            16,
-            16,
-            1,
-            height,
-            0,
-            0,
-            height);
+            -16, -16, 16, 16, 1, height, 0, 0, height);
     }
     else
     {
         track_paint_util_diag_tiles_paint(
-            session,
-            1,
-            height,
-            direction,
-            trackSequence,
-            session->TrackColours[SCHEME_TRACK],
-            junior_rc_track_pieces_diag_25_deg_down_to_60_deg_down[chainType],
-            defaultDiagTileOffsets,
-            defaultDiagBoundLengths,
+            session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+            junior_rc_track_pieces_diag_25_deg_down_to_60_deg_down[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths,
             nullptr);
     }
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            17,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 17, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -6527,34 +5311,18 @@ void junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(
 }
 
 void junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType)
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType)
 {
     track_paint_util_diag_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        junior_rc_track_pieces_diag_60_deg_down_to_25_deg_down[chainType],
-        defaultDiagTileOffsets,
-        defaultDiagBoundLengths,
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        junior_rc_track_pieces_diag_60_deg_down_to_25_deg_down[chainType], defaultDiagTileOffsets, defaultDiagBoundLengths,
         nullptr);
 
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            (direction & 1) ? 2 : 1,
-            junior_rc_diag_support_segment[direction],
-            8,
-            height,
+            session, (direction & 1) ? 2 : 1, junior_rc_diag_support_segment[direction], 8, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -6564,116 +5332,62 @@ void junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(
 }
 
 static void junior_rc_diag_60_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_60_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void junior_rc_diag_60_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_60_deg_down(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void junior_rc_diag_25_deg_up_to_60_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void junior_rc_diag_60_deg_up_to_25_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void junior_rc_diag_25_deg_down_to_60_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void junior_rc_diag_60_deg_down_to_25_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
@@ -6708,11 +5422,7 @@ static constexpr const LocationXY16 junior_rc_60_deg_up_to_flat_tile_offsets[4][
 };
 
 static void junior_rc_flat_to_60_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t image_id = session->TrackColours[SCHEME_TRACK];
@@ -6722,16 +5432,11 @@ static void junior_rc_flat_to_60_deg_up_paint_setup(
     image_id |= junior_rc_track_pieces_flat_to_60_deg_up[isChained][direction][0];
 
     sub_98197C(
-        session,
-        image_id,
-        (int8_t)junior_rc_flat_to_60_deg_up_tile_offsets[direction][0].x,
+        session, image_id, (int8_t)junior_rc_flat_to_60_deg_up_tile_offsets[direction][0].x,
         (int8_t)junior_rc_flat_to_60_deg_up_tile_offsets[direction][0].y,
-        junior_rc_flat_to_60_deg_up_bound_lengths[direction][0].x,
-        junior_rc_flat_to_60_deg_up_bound_lengths[direction][0].y,
-        junior_rc_flat_to_60_deg_up_bound_thickness[direction],
-        height + 24,
-        junior_rc_flat_to_60_deg_up_bound_offsets[direction][0].x,
-        junior_rc_flat_to_60_deg_up_bound_offsets[direction][0].y,
+        junior_rc_flat_to_60_deg_up_bound_lengths[direction][0].x, junior_rc_flat_to_60_deg_up_bound_lengths[direction][0].y,
+        junior_rc_flat_to_60_deg_up_bound_thickness[direction], height + 24,
+        junior_rc_flat_to_60_deg_up_bound_offsets[direction][0].x, junior_rc_flat_to_60_deg_up_bound_offsets[direction][0].y,
         height);
 
     if (junior_rc_track_pieces_flat_to_60_deg_up[isChained][direction][1] != 0)
@@ -6741,17 +5446,12 @@ static void junior_rc_flat_to_60_deg_up_paint_setup(
         image_id |= junior_rc_track_pieces_flat_to_60_deg_up[isChained][direction][1];
 
         sub_98197C(
-            session,
-            image_id,
-            (int8_t)junior_rc_flat_to_60_deg_up_tile_offsets[direction][1].x,
+            session, image_id, (int8_t)junior_rc_flat_to_60_deg_up_tile_offsets[direction][1].x,
             (int8_t)junior_rc_flat_to_60_deg_up_tile_offsets[direction][1].y,
             junior_rc_flat_to_60_deg_up_bound_lengths[direction][1].x,
-            junior_rc_flat_to_60_deg_up_bound_lengths[direction][1].y,
-            junior_rc_flat_to_60_deg_up_bound_thickness[direction],
-            height,
-            junior_rc_flat_to_60_deg_up_bound_offsets[direction][1].x,
-            junior_rc_flat_to_60_deg_up_bound_offsets[direction][1].y,
-            height);
+            junior_rc_flat_to_60_deg_up_bound_lengths[direction][1].y, junior_rc_flat_to_60_deg_up_bound_thickness[direction],
+            height, junior_rc_flat_to_60_deg_up_bound_offsets[direction][1].x,
+            junior_rc_flat_to_60_deg_up_bound_offsets[direction][1].y, height);
     }
 
     switch (direction)
@@ -6776,11 +5476,7 @@ static void junior_rc_flat_to_60_deg_up_paint_setup(
     if (track_paint_util_should_paint_supports(pos))
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            4,
-            support[direction],
-            height - 7,
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, support[direction], height - 7,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -6790,22 +5486,14 @@ static void junior_rc_flat_to_60_deg_up_paint_setup(
 }
 
 static void junior_rc_60_deg_down_to_flat_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_flat_to_60_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void junior_rc_60_deg_up_to_flat_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t image_id = session->TrackColours[SCHEME_TRACK];
@@ -6815,16 +5503,11 @@ static void junior_rc_60_deg_up_to_flat_paint_setup(
     image_id |= junior_rc_track_pieces_60_deg_up_to_flat[isChained][direction][0];
 
     sub_98197C(
-        session,
-        image_id,
-        (int8_t)junior_rc_60_deg_up_to_flat_tile_offsets[direction][0].x,
+        session, image_id, (int8_t)junior_rc_60_deg_up_to_flat_tile_offsets[direction][0].x,
         (int8_t)junior_rc_60_deg_up_to_flat_tile_offsets[direction][0].y,
-        junior_rc_flat_to_60_deg_up_bound_lengths[direction][0].x,
-        junior_rc_flat_to_60_deg_up_bound_lengths[direction][0].y,
-        junior_rc_flat_to_60_deg_up_bound_thickness[direction],
-        height + 24,
-        junior_rc_flat_to_60_deg_up_bound_offsets[direction][0].x,
-        junior_rc_flat_to_60_deg_up_bound_offsets[direction][0].y,
+        junior_rc_flat_to_60_deg_up_bound_lengths[direction][0].x, junior_rc_flat_to_60_deg_up_bound_lengths[direction][0].y,
+        junior_rc_flat_to_60_deg_up_bound_thickness[direction], height + 24,
+        junior_rc_flat_to_60_deg_up_bound_offsets[direction][0].x, junior_rc_flat_to_60_deg_up_bound_offsets[direction][0].y,
         height);
 
     if (junior_rc_track_pieces_60_deg_up_to_flat[isChained][direction][1] != 0)
@@ -6834,17 +5517,12 @@ static void junior_rc_60_deg_up_to_flat_paint_setup(
         image_id |= junior_rc_track_pieces_60_deg_up_to_flat[isChained][direction][1];
 
         sub_98197C(
-            session,
-            image_id,
-            (int8_t)junior_rc_60_deg_up_to_flat_tile_offsets[direction][1].x,
+            session, image_id, (int8_t)junior_rc_60_deg_up_to_flat_tile_offsets[direction][1].x,
             (int8_t)junior_rc_60_deg_up_to_flat_tile_offsets[direction][1].y,
             junior_rc_flat_to_60_deg_up_bound_lengths[direction][1].x,
-            junior_rc_flat_to_60_deg_up_bound_lengths[direction][1].y,
-            junior_rc_flat_to_60_deg_up_bound_thickness[direction],
-            height,
-            junior_rc_flat_to_60_deg_up_bound_offsets[direction][1].x,
-            junior_rc_flat_to_60_deg_up_bound_offsets[direction][1].y,
-            height);
+            junior_rc_flat_to_60_deg_up_bound_lengths[direction][1].y, junior_rc_flat_to_60_deg_up_bound_thickness[direction],
+            height, junior_rc_flat_to_60_deg_up_bound_offsets[direction][1].x,
+            junior_rc_flat_to_60_deg_up_bound_offsets[direction][1].y, height);
     }
 
     switch (direction)
@@ -6868,11 +5546,7 @@ static void junior_rc_60_deg_up_to_flat_paint_setup(
     if (track_paint_util_should_paint_supports(pos))
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK,
-            4,
-            20,
-            height - 5,
+            session, (direction & 1) ? METAL_SUPPORTS_FORK_ALT : METAL_SUPPORTS_FORK, 4, 20, height - 5,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -6882,11 +5556,7 @@ static void junior_rc_60_deg_up_to_flat_paint_setup(
 }
 
 static void junior_rc_flat_to_60_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_60_deg_up_to_flat_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -6894,31 +5564,18 @@ static void junior_rc_flat_to_60_deg_down_paint_setup(
 
 /* rct2: 0x00518394 */
 static void junior_rc_flat_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_flat(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 /* rct2: 0x00515629, 0x00514D22, 0x005151B9 */
 static void paint_junior_rc_station_track(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_station(session, rideIndex, trackSequence, direction, height, tileElement, RIDE_TYPE_JUNIOR_ROLLER_COASTER);
@@ -6926,71 +5583,40 @@ static void paint_junior_rc_station_track(
 
 /* rct2: 0x0051881E */
 static void junior_rc_25_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_25_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 /* rct2: 0x00518B42 */
 static void junior_rc_flat_to_25_deg_up_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_flat_to_25_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 /* rct2: 0x00518E56 */
 static void junior_rc_25_deg_up_to_flat_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_25_deg_up_to_flat(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_FRICTION_WHEELS : JUNIOR_RC_CHAIN_NONE);
 }
 
 /* rct2: 0x005189B0 */
 static void junior_rc_25_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -6998,11 +5624,7 @@ static void junior_rc_25_deg_down_paint_setup(
 
 /* rct2: 0x00518FE8 */
 static void junior_rc_flat_to_25_deg_down_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_25_deg_up_to_flat_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -7010,22 +5632,14 @@ static void junior_rc_flat_to_25_deg_down_paint_setup(
 
 /* rct2: 0x00518CCC */
 static void junior_rc_25_deg_down_to_flat_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_flat_to_25_deg_up_paint_setup(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void junior_rc_booster_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     int32_t XoffsetNESW = 12;
@@ -7036,13 +5650,7 @@ static void junior_rc_booster_paint_setup(
     if (direction & 1)
     {
         sub_98196C(
-            session,
-            SPR_JUNIOR_RC_BOOSTER_NE_SW | session->TrackColours[SCHEME_TRACK],
-            XoffsetNESW,
-            YoffsetNESW,
-            20,
-            32,
-            1,
+            session, SPR_JUNIOR_RC_BOOSTER_NE_SW | session->TrackColours[SCHEME_TRACK], XoffsetNESW, YoffsetNESW, 20, 32, 1,
             height);
 
         paint_util_push_tunnel_right(session, height, TUNNEL_0);
@@ -7050,13 +5658,7 @@ static void junior_rc_booster_paint_setup(
     else
     {
         sub_98196C(
-            session,
-            SPR_JUNIOR_RC_BOOSTER_NW_SE | session->TrackColours[SCHEME_TRACK],
-            XoffsetNWSE,
-            YoffsetNWSE,
-            32,
-            20,
-            1,
+            session, SPR_JUNIOR_RC_BOOSTER_NW_SE | session->TrackColours[SCHEME_TRACK], XoffsetNWSE, YoffsetNWSE, 32, 20, 1,
             height);
 
         paint_util_push_tunnel_left(session, height, TUNNEL_0);
diff --git a/src/openrct2/ride/coaster/JuniorRollerCoaster.h b/src/openrct2/ride/coaster/JuniorRollerCoaster.h
index ce5fbca217..306787ea8f 100644
--- a/src/openrct2/ride/coaster/JuniorRollerCoaster.h
+++ b/src/openrct2/ride/coaster/JuniorRollerCoaster.h
@@ -21,240 +21,95 @@ enum JUNIOR_RC_CHAINTYPE
 };
 
 void junior_rc_paint_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    uint8_t rideType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, uint8_t rideType);
 
 void junior_rc_paint_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 
 void junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 
 void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 
 void junior_rc_paint_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_flat_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_60_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_flat_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 void junior_rc_paint_track_diag_60_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    uint16_t height,
-    const rct_tile_element* tileElement,
-    JUNIOR_RC_CHAINTYPE chainType);
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, uint16_t height,
+    const rct_tile_element* tileElement, JUNIOR_RC_CHAINTYPE chainType);
 
 #endif // _JUNIOR_ROLLER_COASTER_H
diff --git a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp
index 7c2fa8654e..79cf7b0546 100644
--- a/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/LayDownRollerCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x0082491C */
 static void lay_down_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -92,33 +88,13 @@ static void lay_down_rc_track_flat(
                 case 0:
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26557,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26557, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 22);
                     break;
                 case 1:
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26558,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26558, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 22);
                     break;
             }
@@ -130,33 +106,13 @@ static void lay_down_rc_track_flat(
                 case 0:
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26555,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26555, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 22);
                     break;
                 case 1:
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26556,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26556, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 22);
                     break;
             }
@@ -177,11 +133,7 @@ static void lay_down_rc_track_flat(
 
 /** rct2: 0x00824B8C, 0x00824B9C, 0x00824BAC */
 static void lay_down_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_inverted(tileElement))
@@ -194,44 +146,14 @@ static void lay_down_rc_track_station(
         };
 
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][0] | session->TrackColours[SCHEME_MISC],
-            0,
-            0,
-            32,
-            28,
-            1,
-            height,
-            0,
-            2,
+            session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height, 0, 2,
             height);
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            3,
-            height + 24,
-            0,
-            6,
-            height + 24);
+            session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 3, height + 24, 0,
+            6, height + 24);
         sub_98199C_rotated(
-            session,
-            direction,
-            imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS],
-            0,
-            6,
-            32,
-            20,
-            1,
-            height + 24,
-            0,
-            6,
-            height + 24);
+            session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 1, height + 24,
+            0, 6, height + 24);
         track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 11);
         track_paint_util_draw_station_inverted(session, rideIndex, direction, height, tileElement, STATION_VARIANT_1);
         paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_9);
@@ -248,33 +170,13 @@ static void lay_down_rc_track_station(
         if (track_element_get_type(tileElement) == TRACK_ELEM_END_STATION)
         {
             sub_98197C_rotated(
-                session,
-                direction,
-                imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-                0,
-                0,
-                32,
-                20,
-                1,
-                height,
-                0,
-                6,
+                session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
                 height + 3);
         }
         else
         {
             sub_98197C_rotated(
-                session,
-                direction,
-                imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-                0,
-                0,
-                32,
-                20,
-                1,
-                height,
-                0,
-                6,
+                session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
                 height + 3);
         }
         sub_98196C_rotated(
@@ -289,11 +191,7 @@ static void lay_down_rc_track_station(
 
 /** rct2: 0x0082492C */
 static void lay_down_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -372,62 +270,22 @@ static void lay_down_rc_track_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26621,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26621, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26622,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26622, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26623,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26623, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26624,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26624, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
             }
@@ -438,62 +296,22 @@ static void lay_down_rc_track_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26569,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26569, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26570,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26570, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26571,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26571, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26572,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26572, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 40);
                     break;
             }
@@ -538,11 +356,7 @@ static void lay_down_rc_track_25_deg_up(
 
 /** rct2: 0x0082493C */
 static void lay_down_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -557,32 +371,12 @@ static void lay_down_rc_track_60_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16331,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16331, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16332,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16332, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -606,32 +400,12 @@ static void lay_down_rc_track_60_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16303,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16303, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16304,
-                        0,
-                        0,
-                        32,
-                        1,
-                        98,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16304, 0, 0, 32, 1, 98, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -663,62 +437,22 @@ static void lay_down_rc_track_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26585,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26585, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 88);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26586,
-                    0,
-                    0,
-                    32,
-                    2,
-                    81,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26586, 0, 0, 32, 2, 81, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26587,
-                    0,
-                    0,
-                    32,
-                    2,
-                    81,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26587, 0, 0, 32, 2, 81, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26588,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26588, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 88);
                 break;
         }
@@ -738,11 +472,7 @@ static void lay_down_rc_track_60_deg_up(
 
 /** rct2: 0x0082494C */
 static void lay_down_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -821,62 +551,22 @@ static void lay_down_rc_track_flat_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26613,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26613, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26614,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26614, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26615,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26615, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26616,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26616, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
             }
@@ -887,62 +577,22 @@ static void lay_down_rc_track_flat_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26561,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26561, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26562,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26562, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26563,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26563, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26564,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26564, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
             }
@@ -987,11 +637,7 @@ static void lay_down_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x0082495C */
 static void lay_down_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -1008,34 +654,14 @@ static void lay_down_rc_track_25_deg_up_to_60_deg_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16319, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16322,
-                        0,
-                        0,
-                        32,
-                        1,
-                        66,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16322, 0, 0, 32, 1, 66, height, 0, 27,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16320, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16323,
-                        0,
-                        0,
-                        32,
-                        1,
-                        66,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16323, 0, 0, 32, 1, 66, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -1061,34 +687,14 @@ static void lay_down_rc_track_25_deg_up_to_60_deg_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16291, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16294,
-                        0,
-                        0,
-                        32,
-                        1,
-                        66,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16294, 0, 0, 32, 1, 66, height, 0, 27,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16292, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16295,
-                        0,
-                        0,
-                        32,
-                        1,
-                        66,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16295, 0, 0, 32, 1, 66, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -1120,88 +726,28 @@ static void lay_down_rc_track_25_deg_up_to_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26573,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26573, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26577,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26577, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26574,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26574, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26578,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26578, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26575,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26575, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26576,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26576, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
         }
@@ -1221,11 +767,7 @@ static void lay_down_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x0082496C */
 static void lay_down_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -1242,34 +784,14 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16325, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16328,
-                        0,
-                        0,
-                        32,
-                        1,
-                        66,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16328, 0, 0, 32, 1, 66, height, 0, 27,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16326, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16329,
-                        0,
-                        0,
-                        32,
-                        1,
-                        66,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16329, 0, 0, 32, 1, 66, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -1295,34 +817,14 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16297, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16300,
-                        0,
-                        0,
-                        32,
-                        1,
-                        66,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16300, 0, 0, 32, 1, 66, height, 0, 27,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16298, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16301,
-                        0,
-                        0,
-                        32,
-                        1,
-                        66,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16301, 0, 0, 32, 1, 66, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -1354,88 +856,28 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26579,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26579, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26583,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26583, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26580,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26580, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26584,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26584, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26581,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26581, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26582,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26582, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
         }
@@ -1479,11 +921,7 @@ static void lay_down_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x0082497C */
 static void lay_down_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -1562,62 +1000,22 @@ static void lay_down_rc_track_25_deg_up_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26617,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26617, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26618,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26618, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26619,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26619, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26620,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26620, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
             }
@@ -1628,62 +1026,22 @@ static void lay_down_rc_track_25_deg_up_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26565,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26565, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26566,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26566, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26567,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26567, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26568,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26568, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 32);
                     break;
             }
@@ -1728,11 +1086,7 @@ static void lay_down_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x0082498C */
 static void lay_down_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lay_down_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1740,11 +1094,7 @@ static void lay_down_rc_track_25_deg_down(
 
 /** rct2: 0x0082499C */
 static void lay_down_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lay_down_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1752,11 +1102,7 @@ static void lay_down_rc_track_60_deg_down(
 
 /** rct2: 0x008249AC */
 static void lay_down_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lay_down_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1764,11 +1110,7 @@ static void lay_down_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008249BC */
 static void lay_down_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lay_down_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1776,11 +1118,7 @@ static void lay_down_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008249CC */
 static void lay_down_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lay_down_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1788,11 +1126,7 @@ static void lay_down_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008249DC */
 static void lay_down_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lay_down_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1800,11 +1134,7 @@ static void lay_down_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x008249EC */
 static void lay_down_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -1816,62 +1146,22 @@ static void lay_down_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16343,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16343, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16348,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16348, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16353,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16353, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16338,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16338, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -1882,9 +1172,7 @@ static void lay_down_rc_track_left_quarter_turn_5(
                     paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -1896,62 +1184,22 @@ static void lay_down_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16342,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16342, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16347,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16347, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16352,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16352, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16337,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16337, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -1959,8 +1207,7 @@ static void lay_down_rc_track_left_quarter_turn_5(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -1968,69 +1215,27 @@ static void lay_down_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16341,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16341, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16346,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16346, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16351,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16351, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16336,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16336, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -2042,62 +1247,22 @@ static void lay_down_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16340,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16340, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16345,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16345, 0, 0, 16, 32, 3, height, 0, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16350,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16350, 0, 0, 16, 32, 3, height, 0, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16335,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16335, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                 }
@@ -2105,8 +1270,7 @@ static void lay_down_rc_track_left_quarter_turn_5(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 6:
@@ -2114,62 +1278,22 @@ static void lay_down_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16339,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16339, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16344,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16344, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16349,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16349, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16334,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16334, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -2185,9 +1309,7 @@ static void lay_down_rc_track_left_quarter_turn_5(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -2202,62 +1324,22 @@ static void lay_down_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26694,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26694, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26699,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26699, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26704,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26704, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26689,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26689, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -2265,8 +1347,7 @@ static void lay_down_rc_track_left_quarter_turn_5(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2284,71 +1365,30 @@ static void lay_down_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26693,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26693, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26698,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26698, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26703,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26703, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26688,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26688, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -2356,69 +1396,27 @@ static void lay_down_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26692,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26692, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26697,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26697, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26702,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26702, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26687,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26687, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -2430,71 +1428,30 @@ static void lay_down_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26691,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26691, 0, 0, 16, 32, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26696,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26696, 0, 0, 16, 32, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26701,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26701, 0, 0, 16, 32, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26686,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26686, 0, 0, 16, 32, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 6:
@@ -2502,62 +1459,22 @@ static void lay_down_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26690,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26690, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26695,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26695, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26700,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26700, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26685,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26685, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                 }
@@ -2565,8 +1482,7 @@ static void lay_down_rc_track_left_quarter_turn_5(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2587,11 +1503,7 @@ static void lay_down_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x008249FC */
 static void lay_down_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2600,11 +1512,7 @@ static void lay_down_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x00824A0C */
 static void lay_down_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -2648,62 +1556,22 @@ static void lay_down_rc_track_flat_to_left_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26657,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26657, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26658,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26658, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26659,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26659, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26660,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26660, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -2711,8 +1579,7 @@ static void lay_down_rc_track_flat_to_left_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -2726,11 +1593,7 @@ static void lay_down_rc_track_flat_to_left_bank(
 
 /** rct2: 0x00824A1C */
 static void lay_down_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -2774,62 +1637,22 @@ static void lay_down_rc_track_flat_to_right_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26661,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26661, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26662,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26662, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26663,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26663, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26664,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26664, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -2837,8 +1660,7 @@ static void lay_down_rc_track_flat_to_right_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -2852,11 +1674,7 @@ static void lay_down_rc_track_flat_to_right_bank(
 
 /** rct2: 0x00824A2C */
 static void lay_down_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -2900,62 +1718,22 @@ static void lay_down_rc_track_left_bank_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26663,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26663, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26664,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26664, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26661,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26661, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26662,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26662, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -2963,8 +1741,7 @@ static void lay_down_rc_track_left_bank_to_flat(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -2978,11 +1755,7 @@ static void lay_down_rc_track_left_bank_to_flat(
 
 /** rct2: 0x00824A3C */
 static void lay_down_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -3026,62 +1799,22 @@ static void lay_down_rc_track_right_bank_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26659,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26659, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26660,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26660, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26657,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26657, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26658,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26658, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -3089,8 +1822,7 @@ static void lay_down_rc_track_right_bank_to_flat(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -3104,11 +1836,7 @@ static void lay_down_rc_track_right_bank_to_flat(
 
 /** rct2: 0x00824A4C */
 static void lay_down_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -3120,75 +1848,25 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16363,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16363, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16374,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16374, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16368,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16368, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16373,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16373, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16358,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16358, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -3199,9 +1877,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                     paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -3213,62 +1889,22 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16362,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16362, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16367,
-                            0,
-                            0,
-                            32,
-                            16,
-                            1,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16367, 0, 0, 32, 16, 1, height, 0, 0,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16372,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16372, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16357,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16357, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -3276,8 +1912,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -3285,69 +1920,27 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16361,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16361, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16366,
-                            0,
-                            0,
-                            16,
-                            16,
-                            1,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16366, 0, 0, 16, 16, 1, height, 16, 16,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16371,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16371, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16356,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16356, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -3359,62 +1952,22 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16360,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16360, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16365,
-                            0,
-                            0,
-                            16,
-                            32,
-                            1,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16365, 0, 0, 16, 32, 1, height, 0, 0,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16370,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16370, 0, 0, 16, 32, 3, height, 0, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16355,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16355, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                 }
@@ -3422,8 +1975,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 6:
@@ -3431,75 +1983,25 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16359,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16359, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16364,
-                            0,
-                            0,
-                            1,
-                            32,
-                            26,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16364, 0, 0, 1, 32, 26, height, 27, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16369,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16369, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16375,
-                            0,
-                            0,
-                            1,
-                            32,
-                            26,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16375, 0, 0, 1, 32, 26, height, 27, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16354,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16354, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -3515,9 +2017,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -3532,62 +2032,22 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26738,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26738, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26743,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26743, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 24);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26748,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26748, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 24);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26733,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26733, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 24);
                         break;
                 }
@@ -3595,8 +2055,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3622,41 +2081,20 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26747,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26747, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 24);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26732,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26732, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 24);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -3664,48 +2102,18 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26736,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26736, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26741,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26741, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 24);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26746,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26746, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 24);
                         break;
                     case 3:
                         sub_98196C_rotated(
@@ -3713,9 +2121,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -3727,18 +2133,8 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26735,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26735, 0, 0, 16, 32, 3, height + 24, 16,
+                            0, height + 24);
                         break;
                     case 1:
                         sub_98196C_rotated(
@@ -3750,26 +2146,15 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26730,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26730, 0, 0, 16, 32, 3, height + 24, 16,
+                            0, height + 24);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 6:
@@ -3777,62 +2162,22 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26734,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26734, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26739,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26739, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 24);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26744,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26744, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 24);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26729,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26729, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 24);
                         break;
                 }
@@ -3840,8 +2185,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3862,11 +2206,7 @@ static void lay_down_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x00824A5C */
 static void lay_down_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -3875,11 +2215,7 @@ static void lay_down_rc_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x00824A6C */
 static void lay_down_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -3930,62 +2266,22 @@ static void lay_down_rc_track_left_bank_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26665,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26665, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26666,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26666, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26667,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26667, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26668,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26668, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -3993,8 +2289,7 @@ static void lay_down_rc_track_left_bank_to_25_deg_up(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             switch (direction)
@@ -4032,11 +2327,7 @@ static void lay_down_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x00824A7C */
 static void lay_down_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -4087,62 +2378,22 @@ static void lay_down_rc_track_right_bank_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26669,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26669, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26670,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26670, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26671,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26671, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26672,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26672, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -4150,8 +2401,7 @@ static void lay_down_rc_track_right_bank_to_25_deg_up(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             switch (direction)
@@ -4189,11 +2439,7 @@ static void lay_down_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x00824A8C */
 static void lay_down_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -4244,62 +2490,22 @@ static void lay_down_rc_track_25_deg_up_to_left_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26673,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26673, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26674,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26674, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26675,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26675, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26676,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26676, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -4307,8 +2513,7 @@ static void lay_down_rc_track_25_deg_up_to_left_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             switch (direction)
@@ -4346,11 +2551,7 @@ static void lay_down_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x00824A9C */
 static void lay_down_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -4401,62 +2602,22 @@ static void lay_down_rc_track_25_deg_up_to_right_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26677,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26677, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26678,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26678, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26679,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26679, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26680,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26680, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -4464,8 +2625,7 @@ static void lay_down_rc_track_25_deg_up_to_right_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             switch (direction)
@@ -4503,11 +2663,7 @@ static void lay_down_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x00824AAC */
 static void lay_down_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lay_down_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -4515,11 +2671,7 @@ static void lay_down_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x00824ABC */
 static void lay_down_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lay_down_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -4527,11 +2679,7 @@ static void lay_down_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x00824ACC */
 static void lay_down_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lay_down_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -4539,11 +2687,7 @@ static void lay_down_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x00824ADC */
 static void lay_down_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lay_down_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -4551,11 +2695,7 @@ static void lay_down_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x00824AEC */
 static void lay_down_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -4595,62 +2735,22 @@ static void lay_down_rc_track_left_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26681,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26681, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26682,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26682, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26683,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26683, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26684,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26684, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -4658,8 +2758,7 @@ static void lay_down_rc_track_left_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -4673,11 +2772,7 @@ static void lay_down_rc_track_left_bank(
 
 /** rct2: 0x00824AFC */
 static void lay_down_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lay_down_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -4685,11 +2780,7 @@ static void lay_down_rc_track_right_bank(
 
 /** rct2: 0x00824B0C */
 static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -4701,62 +2792,22 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16510,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16510, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16515,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16515, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16520,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16520, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16525,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16525, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -4767,9 +2818,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                     paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -4789,32 +2838,12 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16521,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16521, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16526,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16526, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -4822,8 +2851,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 3:
@@ -4831,47 +2859,17 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16512,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16512, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16517,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16517, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16522,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16522, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
@@ -4880,9 +2878,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 64, 0x20);
                 break;
@@ -4894,17 +2890,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16513,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16513, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
@@ -4917,17 +2903,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16528,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16528, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                 }
@@ -4935,8 +2911,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 6:
@@ -4944,62 +2919,22 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16514,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16514, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16519,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16519, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16524,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16524, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16529,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16529, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -5015,9 +2950,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -5051,8 +2984,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 43, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5089,8 +3021,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 3:
@@ -5114,9 +3045,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 64, 0x20);
                 break;
@@ -5147,8 +3076,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 6:
@@ -5175,8 +3103,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 43, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5197,11 +3124,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x00824B1C */
 static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -5213,62 +3136,22 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16490,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16490, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16495,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16495, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16500,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16500, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16505,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16505, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -5279,9 +3162,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                     paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -5293,32 +3174,12 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16491,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16491, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16496,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16496, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 2:
@@ -5334,8 +3195,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 3:
@@ -5347,54 +3207,22 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16497,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16497, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16502,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16502, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16507,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16507, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 64, 0x20);
                 break;
@@ -5406,17 +3234,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16493,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16493, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
@@ -5429,17 +3247,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16508,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16508, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                 }
@@ -5447,8 +3255,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 6:
@@ -5456,62 +3263,22 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16494,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16494, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16499,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16499, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16504,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16504, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16509,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16509, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -5527,9 +3294,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -5563,8 +3328,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 43, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5601,8 +3365,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 3:
@@ -5626,9 +3389,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 64, 0x20);
                 break;
@@ -5659,8 +3420,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
             case 6:
@@ -5687,8 +3447,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 43, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5709,11 +3468,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x00824B2C */
 static void lay_down_rc_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -5723,11 +3478,7 @@ static void lay_down_rc_track_left_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x00824B3C */
 static void lay_down_rc_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -5737,11 +3488,7 @@ static void lay_down_rc_track_right_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x00824B4C */
 static void lay_down_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -5753,62 +3500,22 @@ static void lay_down_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16402,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16402, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16406,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16406, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16405,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16405, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16409,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16409, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -5819,9 +3526,7 @@ static void lay_down_rc_track_s_bend_left(
                     paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -5842,32 +3547,12 @@ static void lay_down_rc_track_s_bend_left(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16404,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16404, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16408,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16408, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -5875,8 +3560,7 @@ static void lay_down_rc_track_s_bend_left(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -5884,32 +3568,12 @@ static void lay_down_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16404,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16404, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16408,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16408, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
@@ -5929,8 +3593,7 @@ static void lay_down_rc_track_s_bend_left(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -5938,62 +3601,22 @@ static void lay_down_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16405,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16405, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16409,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16409, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16402,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16402, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16406,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16406, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -6009,9 +3632,7 @@ static void lay_down_rc_track_s_bend_left(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -6026,70 +3647,28 @@ static void lay_down_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26641,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26641, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26645,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26645, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26644,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26644, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26648,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26648, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6105,62 +3684,22 @@ static void lay_down_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26642,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26642, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26646,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26646, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26643,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26643, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26647,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26647, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -6169,8 +3708,7 @@ static void lay_down_rc_track_s_bend_left(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -6190,62 +3728,22 @@ static void lay_down_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26643,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26643, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26647,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26647, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26642,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26642, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26646,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26646, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
@@ -6254,8 +3752,7 @@ static void lay_down_rc_track_s_bend_left(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 2:
@@ -6275,70 +3772,28 @@ static void lay_down_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26644,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26644, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26648,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26648, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26641,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26641, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26645,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26645, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6360,11 +3815,7 @@ static void lay_down_rc_track_s_bend_left(
 
 /** rct2: 0x00824B5C */
 static void lay_down_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -6376,62 +3827,22 @@ static void lay_down_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16410,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16410, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16414,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16414, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16413,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16413, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16417,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16417, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -6442,9 +3853,7 @@ static void lay_down_rc_track_s_bend_right(
                     paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -6453,34 +3862,14 @@ static void lay_down_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16411,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16411, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16415,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16415, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6498,8 +3887,7 @@ static void lay_down_rc_track_s_bend_right(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -6515,34 +3903,14 @@ static void lay_down_rc_track_s_bend_right(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16411,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16411, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16415,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16415, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6552,8 +3920,7 @@ static void lay_down_rc_track_s_bend_right(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -6561,62 +3928,22 @@ static void lay_down_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16413,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16413, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16417,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16417, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16410,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16410, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16414,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16414, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -6632,9 +3959,7 @@ static void lay_down_rc_track_s_bend_right(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -6649,70 +3974,28 @@ static void lay_down_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26649,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26649, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26653,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26653, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26652,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26652, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26656,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26656, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6728,62 +4011,22 @@ static void lay_down_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26650,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26650, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26654,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26654, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26651,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26651, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26655,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26655, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
@@ -6792,8 +4035,7 @@ static void lay_down_rc_track_s_bend_right(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -6813,62 +4055,22 @@ static void lay_down_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26651,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26651, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26655,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26655, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26650,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26650, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26654,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26654, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -6877,8 +4079,7 @@ static void lay_down_rc_track_s_bend_right(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 2:
@@ -6898,70 +4099,28 @@ static void lay_down_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26652,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26652, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26656,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26656, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26649,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26649, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26653,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26653, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6983,11 +4142,7 @@ static void lay_down_rc_track_s_bend_right(
 
 /** rct2: 0x00824B6C */
 static void lay_down_rc_track_left_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7028,8 +4183,7 @@ static void lay_down_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 56, 0x20);
             break;
         case 1:
@@ -7064,8 +4218,7 @@ static void lay_down_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 2:
@@ -7073,62 +4226,22 @@ static void lay_down_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16564,
-                        16,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16564, 16, 0, 3, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16572,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16572, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16567,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16567, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16575,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16575, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
             }
@@ -7160,8 +4273,7 @@ static void lay_down_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 4:
@@ -7194,8 +4306,7 @@ static void lay_down_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 7:
@@ -7203,62 +4314,22 @@ static void lay_down_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16567,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16567, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16575,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16575, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16564,
-                        16,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16564, 16, 0, 3, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16572,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16572, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
             }
@@ -7298,8 +4369,7 @@ static void lay_down_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 9:
@@ -7343,8 +4413,7 @@ static void lay_down_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 56, 0x20);
             break;
     }
@@ -7352,11 +4421,7 @@ static void lay_down_rc_track_left_vertical_loop(
 
 /** rct2: 0x00824B7C */
 static void lay_down_rc_track_right_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7424,62 +4489,22 @@ static void lay_down_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16591,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16591, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16583,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16583, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16588,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16588, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16580,
-                        16,
-                        0,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16580, 16, 0, 2, 16, 119, height, 16, 0,
                         height);
                     break;
             }
@@ -7540,62 +4565,22 @@ static void lay_down_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16588,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16588, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16580,
-                        16,
-                        0,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16580, 16, 0, 2, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16591,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16591, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16583,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16583, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
             }
@@ -7671,11 +4656,7 @@ static void lay_down_rc_track_right_vertical_loop(
 
 /** rct2: 0x00824BBC */
 static void lay_down_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -7687,62 +4668,22 @@ static void lay_down_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16381,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16381, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16384,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16384, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16387,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16387, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16378,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16378, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -7753,9 +4694,7 @@ static void lay_down_rc_track_left_quarter_turn_3(
                     paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -7767,69 +4706,27 @@ static void lay_down_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16380,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16380, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16383,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16383, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16386,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16386, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16377,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16377, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -7838,62 +4735,22 @@ static void lay_down_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16379,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16379, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16382,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16382, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16385,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16385, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16376,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16376, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -7909,9 +4766,7 @@ static void lay_down_rc_track_left_quarter_turn_3(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -7926,62 +4781,22 @@ static void lay_down_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26710,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26710, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26713,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26713, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26716,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26716, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26707,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26707, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -7989,8 +4804,7 @@ static void lay_down_rc_track_left_quarter_turn_3(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8008,69 +4822,27 @@ static void lay_down_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26709,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26709, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26712,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26712, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26715,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26715, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26706,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26706, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -8079,62 +4851,22 @@ static void lay_down_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26708,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26708, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26711,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26711, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26714,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26714, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26705,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26705, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                 }
@@ -8142,8 +4874,7 @@ static void lay_down_rc_track_left_quarter_turn_3(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8164,11 +4895,7 @@ static void lay_down_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x00824BCC */
 static void lay_down_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -8177,11 +4904,7 @@ static void lay_down_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x00824BDC */
 static void lay_down_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -8193,75 +4916,25 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16393,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16393, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16400,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16400, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16396,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16396, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16399,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16399, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16390,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16390, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -8272,9 +4945,7 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(
                     paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -8286,69 +4957,27 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16392,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16392, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16395,
-                            0,
-                            0,
-                            16,
-                            16,
-                            1,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16395, 0, 0, 16, 16, 1, height, 0, 0,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16398,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16398, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16389,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16389, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -8357,75 +4986,25 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16391,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16391, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16394,
-                            0,
-                            0,
-                            1,
-                            32,
-                            26,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16394, 0, 0, 1, 32, 26, height, 27, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16397,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16397, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16401,
-                            0,
-                            0,
-                            1,
-                            32,
-                            26,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16401, 0, 0, 1, 32, 26, height, 27, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16388,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16388, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -8441,9 +5020,7 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -8458,62 +5035,22 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26722,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26722, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26725,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26725, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26728,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26728, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26719,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26719, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -8521,8 +5058,7 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8540,69 +5076,27 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26721,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26721, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26724,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26724, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26727,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26727, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26718,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26718, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -8611,62 +5105,22 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26720,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26720, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26723,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26723, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26726,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26726, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26717,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26717, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                 }
@@ -8674,8 +5128,7 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8696,11 +5149,7 @@ static void lay_down_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x00824BEC */
 static void lay_down_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -8709,11 +5158,7 @@ static void lay_down_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x00824BFC */
 static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -8747,9 +5192,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(
                     paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -8791,9 +5234,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -8827,8 +5268,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 41, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8868,8 +5308,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 41, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -8890,11 +5329,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x00824C0C */
 static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -8928,9 +5363,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(
                     paint_util_push_tunnel_rotated(session, direction, height - 8, TUNNEL_1);
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -8978,9 +5411,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -9014,8 +5445,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 41, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -9055,8 +5485,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 41, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -9077,11 +5506,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x00824C1C */
 static void lay_down_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -9091,11 +5516,7 @@ static void lay_down_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x00824C2C */
 static void lay_down_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -9105,11 +5526,7 @@ static void lay_down_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x00824C9C */
 static void lay_down_rc_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9121,32 +5538,12 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16481, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16488,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16488, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16484,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16484, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -9165,10 +5562,8 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -9179,62 +5574,22 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16480,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16480, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16483,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16483, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16486,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16486, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16477,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16477, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -9251,34 +5606,14 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16482,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16482, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16485, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16489,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16489, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -9298,10 +5633,8 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -9315,32 +5648,12 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16481, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16488,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16488, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16484,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16484, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -9360,10 +5673,8 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -9374,62 +5685,22 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16477,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16477, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16480,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16480, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16483,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16483, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16486,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16486, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -9450,34 +5721,14 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16482,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16482, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16485, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16489,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16489, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -9488,10 +5739,8 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -9499,11 +5748,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_small(
 
 /** rct2: 0x00824CAC */
 static void lay_down_rc_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9521,34 +5766,14 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16468,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16468, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16471, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16475,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16475, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -9559,10 +5784,8 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -9573,62 +5796,22 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16463,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16463, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16466,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16466, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16469,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16469, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16472,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16472, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -9647,32 +5830,12 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16467, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16474,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16474, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16470,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16470, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -9692,10 +5855,8 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -9707,34 +5868,14 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16468,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16468, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16471, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16475,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16475, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -9754,10 +5895,8 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -9768,62 +5907,22 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16466,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16466, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16469,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16469, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16472,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16472, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16463,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16463, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -9838,32 +5937,12 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16467, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16474,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16474, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16470,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16470, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -9882,10 +5961,8 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -9893,11 +5970,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_small(
 
 /** rct2: 0x00824CBC */
 static void lay_down_rc_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -9912,11 +5985,7 @@ static void lay_down_rc_track_left_half_banked_helix_down_small(
 
 /** rct2: 0x00824CCC */
 static void lay_down_rc_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -9931,11 +6000,7 @@ static void lay_down_rc_track_right_half_banked_helix_down_small(
 
 /** rct2: 0x00824CDC */
 static void lay_down_rc_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9947,32 +6012,12 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16449, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16460,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16460, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16454,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16454, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -9991,10 +6036,8 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -10009,47 +6052,17 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16453,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16453, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16458,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16458, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16443,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16443, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -10057,8 +6070,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -10066,47 +6078,17 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16447,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16447, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16452,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16452, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16457,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16457, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -10126,32 +6108,12 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16446,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16446, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16451,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16451, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -10160,17 +6122,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16441,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16441, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -10178,8 +6130,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -10191,34 +6142,14 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16450,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16450, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16455, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16461,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16461, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -10238,10 +6169,8 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -10255,32 +6184,12 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16449, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16460,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16460, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16454,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16454, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -10300,10 +6209,8 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -10314,17 +6221,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16443,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16443, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -10333,32 +6230,12 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16453,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16453, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16458,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16458, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -10366,8 +6243,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -10379,47 +6255,17 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16447,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16447, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16452,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16452, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16457,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16457, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -10435,47 +6281,17 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16441,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16441, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16446,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16446, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16451,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16451, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -10487,8 +6303,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -10504,34 +6319,14 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16450,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16450, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16455, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16461,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16461, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -10542,10 +6337,8 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -10553,11 +6346,7 @@ static void lay_down_rc_track_left_half_banked_helix_up_large(
 
 /** rct2: 0x00824CEC */
 static void lay_down_rc_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10575,34 +6364,14 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16428,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16428, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16433, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16439,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16439, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -10613,10 +6382,8 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -10627,47 +6394,17 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16419,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16419, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16424,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16424, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16429,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16429, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -10679,8 +6416,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -10692,47 +6428,17 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16425,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16425, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16430,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16430, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16435,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16435, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -10748,17 +6454,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16421,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16421, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -10767,32 +6463,12 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16431,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16431, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16436,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16436, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -10800,8 +6476,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -10815,32 +6490,12 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16427, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16438,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16438, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16432,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16432, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -10860,10 +6515,8 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -10875,34 +6528,14 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16428,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16428, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16433, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16439,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16439, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -10922,10 +6555,8 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -10936,32 +6567,12 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16424,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16424, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16429,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16429, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -10970,17 +6581,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16419,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16419, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -10988,8 +6589,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -10997,47 +6597,17 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16425,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16425, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16430,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16430, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16435,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16435, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -11061,47 +6631,17 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16431,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16431, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16436,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16436, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16421,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16421, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -11109,8 +6649,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -11120,32 +6659,12 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16427, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16438,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16438, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16432,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16432, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -11164,10 +6683,8 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -11175,11 +6692,7 @@ static void lay_down_rc_track_right_half_banked_helix_up_large(
 
 /** rct2: 0x00824CFC */
 static void lay_down_rc_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -11194,11 +6707,7 @@ static void lay_down_rc_track_left_half_banked_helix_down_large(
 
 /** rct2: 0x00824D0C */
 static void lay_down_rc_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -11213,11 +6722,7 @@ static void lay_down_rc_track_right_half_banked_helix_down_large(
 
 /** rct2: 0x00824D3C */
 static void lay_down_rc_track_left_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -11228,68 +6733,28 @@ static void lay_down_rc_track_left_quarter_turn_1_60_deg_up(
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 16555, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 16559,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 16559, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 1:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 16556, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 16560,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 16560, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 2:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 16557, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 16561,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 16561, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 3:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 16554, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 16558,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 16558, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
         }
@@ -11302,68 +6767,28 @@ static void lay_down_rc_track_left_quarter_turn_1_60_deg_up(
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 26910, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26906,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26906, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 1:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 26911, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26907,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26907, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 2:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 26912, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26908,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26908, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 3:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 26909, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26905,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26905, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
         }
@@ -11375,11 +6800,7 @@ static void lay_down_rc_track_left_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x00824D1C */
 static void lay_down_rc_track_right_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -11390,68 +6811,28 @@ static void lay_down_rc_track_right_quarter_turn_1_60_deg_up(
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 16546, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 16550,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 16550, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 1:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 16547, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 16551,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 16551, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 2:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 16548, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 16552,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 16552, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 3:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 16549, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 16553,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 16553, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
         }
@@ -11464,68 +6845,28 @@ static void lay_down_rc_track_right_quarter_turn_1_60_deg_up(
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 26901, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26897,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26897, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 1:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 26902, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26898,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26898, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 2:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 26903, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26899,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26899, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
             case 3:
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 26904, 0, 0, 28, 28, 3, height, 2, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26900,
-                    0,
-                    0,
-                    28,
-                    28,
-                    1,
-                    height,
-                    2,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26900, 0, 0, 28, 28, 1, height, 2, 2,
                     height + 99);
                 break;
         }
@@ -11538,11 +6879,7 @@ static void lay_down_rc_track_right_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x00824D2C */
 static void lay_down_rc_track_left_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lay_down_rc_track_right_quarter_turn_1_60_deg_up(
@@ -11551,11 +6888,7 @@ static void lay_down_rc_track_left_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x00824D4C */
 static void lay_down_rc_track_right_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lay_down_rc_track_left_quarter_turn_1_60_deg_up(
@@ -11564,11 +6897,7 @@ static void lay_down_rc_track_right_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x00824D5C */
 static void lay_down_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -11603,33 +6932,13 @@ static void lay_down_rc_track_brakes(
             case 0:
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26559,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26559, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 1:
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26560,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26560, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
         }
@@ -11649,11 +6958,7 @@ static void lay_down_rc_track_brakes(
 
 /** rct2: 0x00824D6C */
 static void lay_down_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -11713,17 +7018,7 @@ static void lay_down_rc_track_on_ride_photo(
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26555,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26555, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 1:
@@ -11733,17 +7028,7 @@ static void lay_down_rc_track_on_ride_photo(
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26556,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26556, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 2:
@@ -11753,17 +7038,7 @@ static void lay_down_rc_track_on_ride_photo(
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26555,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26555, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 3:
@@ -11773,17 +7048,7 @@ static void lay_down_rc_track_on_ride_photo(
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26556,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26556, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
         }
@@ -11796,11 +7061,7 @@ static void lay_down_rc_track_on_ride_photo(
 
 /** rct2: 0x00824D8C */
 static void lay_down_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -11812,62 +7073,22 @@ static void lay_down_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16740,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16740, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16744,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16744, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16748,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16748, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16752,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16752, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -11886,62 +7107,22 @@ static void lay_down_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16741,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16741, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16745,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16745, 0, 0, 34, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16749,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16749, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16753,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16753, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -11949,8 +7130,7 @@ static void lay_down_rc_track_left_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -11958,77 +7138,34 @@ static void lay_down_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16742,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16742, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16746,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16746, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16750,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16750, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16754,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16754, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -12037,68 +7174,28 @@ static void lay_down_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16743,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16743, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16747,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16747, 0, 0, 16, 18, 3, height, 0, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16751,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16751, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16755,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16755, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12108,8 +7205,7 @@ static void lay_down_rc_track_left_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
         }
@@ -12123,62 +7219,22 @@ static void lay_down_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26765,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26765, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26769,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26769, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26773,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26773, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26777,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26777, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -12199,71 +7255,30 @@ static void lay_down_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26766,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26766, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26770,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26770, 0, 0, 34, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26774,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26774, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26778,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26778, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -12271,77 +7286,34 @@ static void lay_down_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26767,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26767, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26771,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26771, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26775,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26775, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26779,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26779, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -12350,63 +7322,23 @@ static void lay_down_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26768,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26768, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26772,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26772, 0, 0, 16, 18, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26776,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26776, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26780,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26780, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                 }
 
@@ -12414,8 +7346,7 @@ static void lay_down_rc_track_left_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -12444,11 +7375,7 @@ static void lay_down_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x00824D9C */
 static void lay_down_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -12460,62 +7387,22 @@ static void lay_down_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16724,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16724, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16728,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16728, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16732,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16732, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16736,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16736, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -12534,62 +7421,22 @@ static void lay_down_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16725,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16725, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16729,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16729, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16733,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16733, 0, 0, 34, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16737,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16737, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
@@ -12597,8 +7444,7 @@ static void lay_down_rc_track_right_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -12606,77 +7452,34 @@ static void lay_down_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16726,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16726, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16730,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16730, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16734,
-                            0,
-                            0,
-                            28,
-                            28,
-                            3,
-                            height,
-                            4,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16734, 0, 0, 28, 28, 3, height, 4, 4,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16738,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16738, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -12685,68 +7488,28 @@ static void lay_down_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16727,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16727, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16731,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16731, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16735,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16735, 0, 0, 16, 18, 3, height, 0, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16739,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16739, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12756,8 +7519,7 @@ static void lay_down_rc_track_right_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
         }
@@ -12771,62 +7533,22 @@ static void lay_down_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26749,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26749, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26753,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26753, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26757,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26757, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26761,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26761, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -12847,62 +7569,22 @@ static void lay_down_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26750,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26750, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26754,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26754, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26758,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26758, 0, 0, 34, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26762,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26762, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
@@ -12910,8 +7592,7 @@ static void lay_down_rc_track_right_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -12919,77 +7600,34 @@ static void lay_down_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26751,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26751, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26755,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26755, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26759,
-                            0,
-                            0,
-                            28,
-                            28,
-                            3,
-                            height + 24,
-                            4,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26759, 0, 0, 28, 28, 3, height + 24, 4, 4,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26763,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26763, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -12998,63 +7636,23 @@ static void lay_down_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26752,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26752, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26756,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26756, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26760,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26760, 0, 0, 16, 18, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26764,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26764, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                 }
 
@@ -13062,8 +7660,7 @@ static void lay_down_rc_track_right_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -13092,11 +7689,7 @@ static void lay_down_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x00824DAC */
 static void lay_down_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -13105,11 +7698,7 @@ static void lay_down_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x00824DBC */
 static void lay_down_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -13118,11 +7707,7 @@ static void lay_down_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x00824DCC */
 static void lay_down_rc_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -13134,62 +7719,22 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16772,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16772, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16776,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16776, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16780,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16780, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16784,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16784, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -13208,62 +7753,22 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16773,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16773, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16777,
-                            0,
-                            0,
-                            34,
-                            16,
-                            0,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16777, 0, 0, 34, 16, 0, height, 0, 0,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16781,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16781, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16785,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16785, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -13271,8 +7776,7 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -13280,77 +7784,34 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16774,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16774, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16778,
-                            0,
-                            0,
-                            16,
-                            16,
-                            0,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16778, 0, 0, 16, 16, 0, height, 16, 16,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16782,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16782, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16786,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16786, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -13359,68 +7820,28 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16775,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16775, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16779,
-                            0,
-                            0,
-                            16,
-                            18,
-                            0,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16779, 0, 0, 16, 18, 0, height, 0, 16,
                             height + 27);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16783,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16783, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16787,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16787, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -13430,8 +7851,7 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
         }
@@ -13445,70 +7865,28 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26853,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26853, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26857,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26857, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26861,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26861, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26865,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26865, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
@@ -13524,71 +7902,30 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26854,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26854, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26858,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26858, 0, 0, 34, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26862,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26862, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26866,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26866, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -13596,77 +7933,34 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26855,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26855, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26859,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26859, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26863,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26863, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26867,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26867, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -13675,63 +7969,23 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26856,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26856, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26860,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26860, 0, 0, 16, 18, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26864,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26864, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26868,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26868, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                 }
 
@@ -13739,8 +7993,7 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -13769,11 +8022,7 @@ static void lay_down_rc_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x00824DDC */
 static void lay_down_rc_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -13785,62 +8034,22 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16756,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16756, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16760,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16760, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16764,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16764, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16768,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16768, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                 }
@@ -13859,62 +8068,22 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16757,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16757, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16761,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16761, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16765,
-                            0,
-                            0,
-                            34,
-                            16,
-                            0,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16765, 0, 0, 34, 16, 0, height, 0, 0,
                             height + 27);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16769,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16769, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
@@ -13922,8 +8091,7 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -13931,77 +8099,34 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16758,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16758, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16762,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16762, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16766,
-                            0,
-                            0,
-                            28,
-                            28,
-                            0,
-                            height,
-                            4,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16766, 0, 0, 28, 28, 0, height, 4, 4,
                             height + 27);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16770,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16770, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -14010,68 +8135,28 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16759,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16759, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16763,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16763, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16767,
-                            0,
-                            0,
-                            16,
-                            18,
-                            0,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16767, 0, 0, 16, 18, 0, height, 0, 16,
                             height + 27);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16771,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16771, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -14081,8 +8166,7 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
         }
@@ -14096,70 +8180,28 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26837,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26837, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26841,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26841, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26845,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26845, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26849,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26849, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
@@ -14175,62 +8217,22 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26838,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26838, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26842,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26842, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26846,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26846, 0, 0, 34, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26850,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26850, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
@@ -14238,8 +8240,7 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -14247,77 +8248,34 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26839,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26839, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26843,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26843, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26847,
-                            0,
-                            0,
-                            28,
-                            28,
-                            3,
-                            height + 24,
-                            4,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26847, 0, 0, 28, 28, 3, height + 24, 4, 4,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26851,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26851, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -14326,63 +8284,23 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26840,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26840, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26844,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26844, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26848,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26848, 0, 0, 16, 18, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26852,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26852, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                 }
 
@@ -14390,8 +8308,7 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -14420,11 +8337,7 @@ static void lay_down_rc_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x00824DEC */
 static void lay_down_rc_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -14433,11 +8346,7 @@ static void lay_down_rc_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x00824DFC */
 static void lay_down_rc_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -14446,11 +8355,7 @@ static void lay_down_rc_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x00824D7C */
 static void lay_down_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -14464,18 +8369,8 @@ static void lay_down_rc_track_diag_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16699,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16699, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -14485,25 +8380,13 @@ static void lay_down_rc_track_diag_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16637,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16637, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -14514,18 +8397,8 @@ static void lay_down_rc_track_diag_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16696,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16696, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -14535,25 +8408,13 @@ static void lay_down_rc_track_diag_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16634,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16634, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -14564,18 +8425,8 @@ static void lay_down_rc_track_diag_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16698,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16698, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -14585,25 +8436,13 @@ static void lay_down_rc_track_diag_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16636,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16636, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -14618,18 +8457,8 @@ static void lay_down_rc_track_diag_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16697,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16697, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_a_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -14653,18 +8482,8 @@ static void lay_down_rc_track_diag_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16635,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16635, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_a_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -14679,9 +8498,7 @@ static void lay_down_rc_track_diag_flat(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -14698,18 +8515,8 @@ static void lay_down_rc_track_diag_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26812,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26812, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
@@ -14719,25 +8526,13 @@ static void lay_down_rc_track_diag_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26784,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26784, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -14748,18 +8543,8 @@ static void lay_down_rc_track_diag_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26809,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26809, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
@@ -14769,25 +8554,13 @@ static void lay_down_rc_track_diag_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26781,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26781, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -14798,18 +8571,8 @@ static void lay_down_rc_track_diag_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26811,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26811, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
@@ -14819,25 +8582,13 @@ static void lay_down_rc_track_diag_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26783,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26783, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -14848,18 +8599,8 @@ static void lay_down_rc_track_diag_flat(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26810,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26810, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
@@ -14869,26 +8610,14 @@ static void lay_down_rc_track_diag_flat(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26782,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26782, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -14918,11 +8647,7 @@ static void lay_down_rc_track_diag_flat(
 
 /** rct2: 0x00824E2C */
 static void lay_down_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -14936,18 +8661,8 @@ static void lay_down_rc_track_diag_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16711,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16711, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -14957,25 +8672,13 @@ static void lay_down_rc_track_diag_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16649,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16649, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14986,18 +8689,8 @@ static void lay_down_rc_track_diag_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16708,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16708, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15007,25 +8700,13 @@ static void lay_down_rc_track_diag_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16646,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16646, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -15036,18 +8717,8 @@ static void lay_down_rc_track_diag_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16710,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16710, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15057,25 +8728,13 @@ static void lay_down_rc_track_diag_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16648,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16648, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -15090,18 +8749,8 @@ static void lay_down_rc_track_diag_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16709,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16709, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -15125,18 +8774,8 @@ static void lay_down_rc_track_diag_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16647,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16647, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -15151,9 +8790,7 @@ static void lay_down_rc_track_diag_25_deg_up(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -15170,18 +8807,8 @@ static void lay_down_rc_track_diag_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26824,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26824, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
@@ -15191,25 +8818,13 @@ static void lay_down_rc_track_diag_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26796,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26796, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -15220,18 +8835,8 @@ static void lay_down_rc_track_diag_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26821,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26821, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
@@ -15241,25 +8846,13 @@ static void lay_down_rc_track_diag_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26793,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26793, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -15270,18 +8863,8 @@ static void lay_down_rc_track_diag_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26823,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26823, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
@@ -15291,25 +8874,13 @@ static void lay_down_rc_track_diag_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26795,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26795, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -15320,18 +8891,8 @@ static void lay_down_rc_track_diag_25_deg_up(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26822,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26822, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
@@ -15341,26 +8902,14 @@ static void lay_down_rc_track_diag_25_deg_up(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26794,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26794, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -15390,11 +8939,7 @@ static void lay_down_rc_track_diag_25_deg_up(
 
 /** rct2: 0x00824E8C */
 static void lay_down_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -15408,18 +8953,8 @@ static void lay_down_rc_track_diag_60_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16723,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16723, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15429,25 +8964,13 @@ static void lay_down_rc_track_diag_60_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16661,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16661, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -15458,18 +8981,8 @@ static void lay_down_rc_track_diag_60_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16720,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16720, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15479,25 +8992,13 @@ static void lay_down_rc_track_diag_60_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16658,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16658, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -15508,18 +9009,8 @@ static void lay_down_rc_track_diag_60_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16722,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16722, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15529,25 +9020,13 @@ static void lay_down_rc_track_diag_60_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16660,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16660, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -15562,18 +9041,8 @@ static void lay_down_rc_track_diag_60_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16721,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16721, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 36, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -15597,18 +9066,8 @@ static void lay_down_rc_track_diag_60_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16659,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16659, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 36, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -15623,9 +9082,7 @@ static void lay_down_rc_track_diag_60_deg_up(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -15640,24 +9097,12 @@ static void lay_down_rc_track_diag_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26808,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26808, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -15666,24 +9111,12 @@ static void lay_down_rc_track_diag_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26805,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26805, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -15692,24 +9125,12 @@ static void lay_down_rc_track_diag_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26807,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26807, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -15718,25 +9139,13 @@ static void lay_down_rc_track_diag_60_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26806,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26806, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 24);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -15766,11 +9175,7 @@ static void lay_down_rc_track_diag_60_deg_up(
 
 /** rct2: 0x00824E0C */
 static void lay_down_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -15784,18 +9189,8 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16703,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16703, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15805,25 +9200,13 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16641,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16641, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -15834,18 +9217,8 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16700,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16700, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15855,25 +9228,13 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16638,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16638, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -15884,18 +9245,8 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16702,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16702, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15905,25 +9256,13 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16640,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16640, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -15938,18 +9277,8 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16701,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16701, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -15973,18 +9302,8 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16639,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16639, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -15999,9 +9318,7 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16018,18 +9335,8 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26816,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26816, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -16039,25 +9346,13 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26788,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26788, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16068,18 +9363,8 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26813,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26813, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -16089,25 +9374,13 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26785,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26785, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16118,18 +9391,8 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26815,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26815, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -16139,25 +9402,13 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26787,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26787, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16168,18 +9419,8 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26814,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26814, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -16189,26 +9430,14 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26786,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26786, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -16238,11 +9467,7 @@ static void lay_down_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x00824E6C */
 static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -16256,18 +9481,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16715,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16715, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16277,25 +9492,13 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16653,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16653, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16306,18 +9509,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16712,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16712, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16327,25 +9520,13 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16650,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16650, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16356,18 +9537,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16714,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16714, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16377,25 +9548,13 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16652,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16652, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16410,18 +9569,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16713,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16713, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -16445,18 +9594,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16651,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16651, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -16471,9 +9610,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16488,24 +9625,12 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26800,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26800, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16514,24 +9639,12 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26797,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26797, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16540,24 +9653,12 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26799,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26799, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16566,25 +9667,13 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26798,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26798, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -16614,11 +9703,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x00824E7C */
 static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -16632,18 +9717,8 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16719,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16719, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16653,25 +9728,13 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16657,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16657, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16682,18 +9745,8 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16716,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16716, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16703,25 +9756,13 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16654,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16654, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16732,18 +9773,8 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16718,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16718, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16753,25 +9784,13 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16656,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16656, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16786,18 +9805,8 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16717,
-                                -16,
-                                -16,
-                                16,
-                                16,
-                                3,
-                                height,
-                                0,
-                                0,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16717, -16, -16, 16, 16, 3, height, 0,
+                                0, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 21, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -16821,18 +9830,8 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16655,
-                                -16,
-                                -16,
-                                16,
-                                16,
-                                3,
-                                height,
-                                0,
-                                0,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16655, -16, -16, 16, 16, 3, height, 0,
+                                0, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 21, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -16847,9 +9846,7 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16864,24 +9861,12 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26804,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26804, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16890,24 +9875,12 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26801,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26801, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16916,24 +9889,12 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26803,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26803, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16942,25 +9903,13 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26802,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26802, -16, -16, 16, 16, 3, height + 24,
+                            0, 0, height + 56);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -16990,11 +9939,7 @@ static void lay_down_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x00824E1C */
 static void lay_down_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -17008,18 +9953,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16707,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16707, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17029,25 +9964,13 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16645,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16645, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -17058,18 +9981,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16704,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16704, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17079,25 +9992,13 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16642,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16642, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -17108,18 +10009,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16706,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16706, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17129,25 +10020,13 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16644,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16644, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -17162,18 +10041,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16705,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16705, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -17197,18 +10066,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16643,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16643, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -17223,9 +10082,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -17242,18 +10099,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26820,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26820, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -17263,25 +10110,13 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26792,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26792, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -17292,18 +10127,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26817,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26817, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -17313,25 +10138,13 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26789,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26789, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -17342,18 +10155,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26819,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26819, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -17363,25 +10166,13 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26791,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26791, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -17392,18 +10183,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26818,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26818, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -17413,26 +10194,14 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26790,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26790, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -17462,11 +10231,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x00824E5C */
 static void lay_down_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -17480,18 +10245,8 @@ static void lay_down_rc_track_diag_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16709,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16709, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17501,25 +10256,13 @@ static void lay_down_rc_track_diag_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16647,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16647, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -17530,18 +10273,8 @@ static void lay_down_rc_track_diag_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16710,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16710, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17551,25 +10284,13 @@ static void lay_down_rc_track_diag_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16648,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16648, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -17580,18 +10301,8 @@ static void lay_down_rc_track_diag_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16708,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16708, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17601,25 +10312,13 @@ static void lay_down_rc_track_diag_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16646,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16646, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -17634,18 +10333,8 @@ static void lay_down_rc_track_diag_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16711,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16711, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -17669,18 +10358,8 @@ static void lay_down_rc_track_diag_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16649,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16649, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -17695,9 +10374,7 @@ static void lay_down_rc_track_diag_25_deg_down(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -17712,24 +10389,12 @@ static void lay_down_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26794,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26794, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -17738,24 +10403,12 @@ static void lay_down_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26795,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26795, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -17764,24 +10417,12 @@ static void lay_down_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26793,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26793, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -17790,25 +10431,13 @@ static void lay_down_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26796,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26796, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -17838,11 +10467,7 @@ static void lay_down_rc_track_diag_25_deg_down(
 
 /** rct2: 0x00824EBC */
 static void lay_down_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -17856,18 +10481,8 @@ static void lay_down_rc_track_diag_60_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16721,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16721, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17877,25 +10492,13 @@ static void lay_down_rc_track_diag_60_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16659,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16659, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -17906,18 +10509,8 @@ static void lay_down_rc_track_diag_60_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16722,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16722, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17927,25 +10520,13 @@ static void lay_down_rc_track_diag_60_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16660,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16660, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -17956,18 +10537,8 @@ static void lay_down_rc_track_diag_60_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16720,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16720, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -17977,25 +10548,13 @@ static void lay_down_rc_track_diag_60_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16658,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16658, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -18010,18 +10569,8 @@ static void lay_down_rc_track_diag_60_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16723,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16723, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 28, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -18045,18 +10594,8 @@ static void lay_down_rc_track_diag_60_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16661,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16661, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 28, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -18071,9 +10610,7 @@ static void lay_down_rc_track_diag_60_deg_down(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -18088,24 +10625,12 @@ static void lay_down_rc_track_diag_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26806,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26806, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 24);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -18114,24 +10639,12 @@ static void lay_down_rc_track_diag_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26807,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26807, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -18140,24 +10653,12 @@ static void lay_down_rc_track_diag_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26805,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26805, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -18166,25 +10667,13 @@ static void lay_down_rc_track_diag_60_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26808,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26808, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -18214,11 +10703,7 @@ static void lay_down_rc_track_diag_60_deg_down(
 
 /** rct2: 0x00824E3C */
 static void lay_down_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -18232,18 +10717,8 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16705,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16705, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18253,25 +10728,13 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16643,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16643, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -18281,18 +10744,8 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16706,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16706, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18302,25 +10755,13 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16644,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16644, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -18330,18 +10771,8 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16704,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16704, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18351,25 +10782,13 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16642,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16642, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -18383,18 +10802,8 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16707,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16707, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -18418,18 +10827,8 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16645,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16645, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -18444,9 +10843,7 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 break;
         }
@@ -18460,24 +10857,12 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26790,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26790, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -18485,24 +10870,12 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26791,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26791, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -18510,24 +10883,12 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26789,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26789, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -18535,25 +10896,13 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26792,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26792, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -18583,11 +10932,7 @@ static void lay_down_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x00824E9C */
 static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -18601,18 +10946,8 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16717,
-                                -16,
-                                -16,
-                                16,
-                                16,
-                                3,
-                                height,
-                                0,
-                                0,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16717, -16, -16, 16, 16, 3, height, 0,
+                                0, height);
                             break;
                     }
                 }
@@ -18622,25 +10957,13 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16655,
-                                -16,
-                                -16,
-                                16,
-                                16,
-                                3,
-                                height,
-                                0,
-                                0,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16655, -16, -16, 16, 16, 3, height, 0,
+                                0, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -18651,18 +10974,8 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16718,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16718, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18672,25 +10985,13 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16656,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16656, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -18701,18 +11002,8 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16716,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16716, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18722,25 +11013,13 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16654,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16654, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -18755,18 +11034,8 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16719,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16719, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 17, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -18790,18 +11059,8 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16657,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16657, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 17, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -18816,9 +11075,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -18833,24 +11090,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26802,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26802, -16, -16, 16, 16, 3, height + 24,
+                            0, 0, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -18859,24 +11104,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26803,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26803, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -18885,24 +11118,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26801,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26801, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -18911,25 +11132,13 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26804,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26804, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -18959,11 +11168,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x00824EAC */
 static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -18977,18 +11182,8 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16713,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16713, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -18998,25 +11193,13 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16651,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16651, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -19027,18 +11210,8 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16714,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16714, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -19048,25 +11221,13 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16652,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16652, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -19077,18 +11238,8 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16712,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16712, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -19098,25 +11249,13 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16650,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16650, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -19131,18 +11270,8 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16715,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16715, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -19166,18 +11295,8 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16653,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16653, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -19192,9 +11311,7 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -19209,24 +11326,12 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26798,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26798, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -19235,24 +11340,12 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26799,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26799, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -19261,24 +11354,12 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26797,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26797, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -19287,25 +11368,13 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26800,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26800, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -19335,11 +11404,7 @@ static void lay_down_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x00824E4C */
 static void lay_down_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -19353,18 +11418,8 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16701,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16701, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -19374,25 +11429,13 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16639,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16639, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19403,18 +11446,8 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16702,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16702, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -19424,25 +11457,13 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16640,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16640, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19453,18 +11474,8 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16700,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16700, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -19474,25 +11485,13 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16638,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16638, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19507,18 +11506,8 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16703,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16703, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -19542,18 +11531,8 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16641,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16641, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -19568,9 +11547,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19585,24 +11562,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26786,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26786, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19611,24 +11576,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26787,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26787, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19637,24 +11590,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26785,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26785, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19663,25 +11604,13 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26788,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26788, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -19711,11 +11640,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x00824EEC */
 static void lay_down_rc_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -19727,24 +11652,12 @@ static void lay_down_rc_track_diag_flat_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16669,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16669, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -19753,37 +11666,15 @@ static void lay_down_rc_track_diag_flat_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16666,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16666, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16670,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16670, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -19792,24 +11683,12 @@ static void lay_down_rc_track_diag_flat_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16668,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16668, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -19822,18 +11701,8 @@ static void lay_down_rc_track_diag_flat_to_left_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16667,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16667, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -19847,9 +11716,7 @@ static void lay_down_rc_track_diag_flat_to_left_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -19864,24 +11731,12 @@ static void lay_down_rc_track_diag_flat_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26876,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26876, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -19890,24 +11745,12 @@ static void lay_down_rc_track_diag_flat_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26873,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26873, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -19916,24 +11759,12 @@ static void lay_down_rc_track_diag_flat_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26875,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26875, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -19942,26 +11773,15 @@ static void lay_down_rc_track_diag_flat_to_left_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26874,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26874, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -19990,11 +11810,7 @@ static void lay_down_rc_track_diag_flat_to_left_bank(
 
 /** rct2: 0x00824EFC */
 static void lay_down_rc_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -20006,24 +11822,12 @@ static void lay_down_rc_track_diag_flat_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16674,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16674, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20032,24 +11836,12 @@ static void lay_down_rc_track_diag_flat_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16671,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16671, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20058,37 +11850,15 @@ static void lay_down_rc_track_diag_flat_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16673,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16673, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16675,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16675, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20101,18 +11871,8 @@ static void lay_down_rc_track_diag_flat_to_right_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16672,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16672, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -20126,9 +11886,7 @@ static void lay_down_rc_track_diag_flat_to_right_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20143,24 +11901,12 @@ static void lay_down_rc_track_diag_flat_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26880,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26880, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20169,24 +11915,12 @@ static void lay_down_rc_track_diag_flat_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26877,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26877, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20195,24 +11929,12 @@ static void lay_down_rc_track_diag_flat_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26879,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26879, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20221,26 +11943,15 @@ static void lay_down_rc_track_diag_flat_to_right_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26878,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26878, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -20269,11 +11980,7 @@ static void lay_down_rc_track_diag_flat_to_right_bank(
 
 /** rct2: 0x00824F0C */
 static void lay_down_rc_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -20285,24 +11992,12 @@ static void lay_down_rc_track_diag_left_bank_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16672,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16672, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20311,37 +12006,15 @@ static void lay_down_rc_track_diag_left_bank_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16673,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16673, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16675,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16675, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20350,24 +12023,12 @@ static void lay_down_rc_track_diag_left_bank_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16671,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16671, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20380,18 +12041,8 @@ static void lay_down_rc_track_diag_left_bank_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16674,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16674, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -20405,9 +12056,7 @@ static void lay_down_rc_track_diag_left_bank_to_flat(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20422,24 +12071,12 @@ static void lay_down_rc_track_diag_left_bank_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26878,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26878, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20448,24 +12085,12 @@ static void lay_down_rc_track_diag_left_bank_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26879,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26879, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20474,24 +12099,12 @@ static void lay_down_rc_track_diag_left_bank_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26877,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26877, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20500,26 +12113,15 @@ static void lay_down_rc_track_diag_left_bank_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26880,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26880, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -20548,11 +12150,7 @@ static void lay_down_rc_track_diag_left_bank_to_flat(
 
 /** rct2: 0x00824F1C */
 static void lay_down_rc_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -20564,24 +12162,12 @@ static void lay_down_rc_track_diag_right_bank_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16667,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16667, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20590,24 +12176,12 @@ static void lay_down_rc_track_diag_right_bank_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16668,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16668, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20616,37 +12190,15 @@ static void lay_down_rc_track_diag_right_bank_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16666,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16666, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16670,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16670, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20659,18 +12211,8 @@ static void lay_down_rc_track_diag_right_bank_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16669,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16669, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -20684,9 +12226,7 @@ static void lay_down_rc_track_diag_right_bank_to_flat(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20701,24 +12241,12 @@ static void lay_down_rc_track_diag_right_bank_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26874,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26874, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20727,24 +12255,12 @@ static void lay_down_rc_track_diag_right_bank_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26875,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26875, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20753,24 +12269,12 @@ static void lay_down_rc_track_diag_right_bank_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26873,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26873, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20779,26 +12283,15 @@ static void lay_down_rc_track_diag_right_bank_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26876,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26876, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -20827,11 +12320,7 @@ static void lay_down_rc_track_diag_right_bank_to_flat(
 
 /** rct2: 0x00824F4C */
 static void lay_down_rc_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -20843,24 +12332,12 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16689,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16689, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -20869,37 +12346,15 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16686,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16686, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16690,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16690, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -20908,24 +12363,12 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16688,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16688, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -20938,18 +12381,8 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16687,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16687, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -20963,9 +12396,7 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -20980,24 +12411,12 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26892,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26892, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21006,24 +12425,12 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26889,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26889, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21032,24 +12439,12 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26891,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26891, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21058,25 +12453,13 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26890,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26890, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -21106,11 +12489,7 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x00824F5C */
 static void lay_down_rc_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -21122,24 +12501,12 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16694,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16694, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21148,24 +12515,12 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16691,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16691, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21174,37 +12529,15 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16693,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16693, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16695,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16695, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21217,18 +12550,8 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16692,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16692, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -21242,9 +12565,7 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21259,24 +12580,12 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26896,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26896, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21285,24 +12594,12 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26893,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26893, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21311,24 +12608,12 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26895,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26895, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -21337,25 +12622,13 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26894,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26894, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -21385,11 +12658,7 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x00824F2C */
 static void lay_down_rc_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -21401,24 +12670,12 @@ static void lay_down_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16679,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16679, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -21427,37 +12684,15 @@ static void lay_down_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16676,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16676, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16680,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16680, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -21466,24 +12701,12 @@ static void lay_down_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16678,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16678, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -21496,18 +12719,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_left_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16677,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16677, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -21521,9 +12734,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_left_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -21538,24 +12749,12 @@ static void lay_down_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26884,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26884, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -21564,24 +12763,12 @@ static void lay_down_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26881,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26881, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -21590,24 +12777,12 @@ static void lay_down_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26883,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26883, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -21616,25 +12791,13 @@ static void lay_down_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26882,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26882, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -21664,11 +12827,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x00824F3C */
 static void lay_down_rc_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -21680,24 +12839,12 @@ static void lay_down_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16684,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16684, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -21706,24 +12853,12 @@ static void lay_down_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16681,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16681, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -21732,37 +12867,15 @@ static void lay_down_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16683,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16683, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16685,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16685, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -21775,18 +12888,8 @@ static void lay_down_rc_track_diag_25_deg_up_to_right_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16682,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16682, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -21800,9 +12903,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_right_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -21817,24 +12918,12 @@ static void lay_down_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26888,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26888, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -21843,24 +12932,12 @@ static void lay_down_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26885,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26885, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -21869,24 +12946,12 @@ static void lay_down_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26887,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26887, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -21895,25 +12960,13 @@ static void lay_down_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26886,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26886, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -21943,11 +12996,7 @@ static void lay_down_rc_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x00824F6C */
 static void lay_down_rc_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -21959,24 +13008,12 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16682,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16682, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -21984,37 +13021,15 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16683,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16683, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16685,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16685, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -22022,24 +13037,12 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16681,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16681, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -22051,18 +13054,8 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16684,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16684, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -22076,9 +13069,7 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_down(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 break;
         }
@@ -22092,24 +13083,12 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26886,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26886, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -22117,24 +13096,12 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26887,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26887, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -22142,24 +13109,12 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26885,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26885, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -22167,25 +13122,13 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26888,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26888, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -22215,11 +13158,7 @@ static void lay_down_rc_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x00824F7C */
 static void lay_down_rc_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -22231,24 +13170,12 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16677,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16677, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -22256,24 +13183,12 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16678,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16678, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -22281,37 +13196,15 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16676,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16676, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16680,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16680, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -22323,18 +13216,8 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16679,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16679, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -22348,9 +13231,7 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_down(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 break;
         }
@@ -22364,24 +13245,12 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26882,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26882, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -22389,24 +13258,12 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26883,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26883, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -22414,24 +13271,12 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26881,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26881, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -22439,25 +13284,13 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26884,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26884, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -22487,11 +13320,7 @@ static void lay_down_rc_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x00824F8C */
 static void lay_down_rc_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -22503,24 +13332,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16692,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16692, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22529,37 +13346,15 @@ static void lay_down_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16693,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16693, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16695,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16695, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22568,24 +13363,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16691,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16691, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22598,18 +13381,8 @@ static void lay_down_rc_track_diag_25_deg_down_to_left_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16694,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16694, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -22623,9 +13396,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_left_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22640,24 +13411,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26894,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26894, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22666,24 +13425,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26895,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26895, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22692,24 +13439,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26893,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26893, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22718,25 +13453,13 @@ static void lay_down_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26896,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26896, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -22766,11 +13489,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x00824F9C */
 static void lay_down_rc_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -22782,24 +13501,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16687,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16687, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22808,24 +13515,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16688,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16688, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22834,37 +13529,15 @@ static void lay_down_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16686,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16686, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16690,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16690, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22877,18 +13550,8 @@ static void lay_down_rc_track_diag_25_deg_down_to_right_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16689,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16689, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -22902,9 +13565,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_right_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22919,24 +13580,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26890,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26890, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22945,24 +13594,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26891,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26891, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22971,24 +13608,12 @@ static void lay_down_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26889,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26889, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -22997,25 +13622,13 @@ static void lay_down_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26892,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26892, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -23045,11 +13658,7 @@ static void lay_down_rc_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x00824ECC */
 static void lay_down_rc_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -23061,24 +13670,12 @@ static void lay_down_rc_track_diag_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16665,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16665, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -23087,24 +13684,12 @@ static void lay_down_rc_track_diag_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16662,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16662, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -23113,24 +13698,12 @@ static void lay_down_rc_track_diag_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16664,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16664, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -23143,18 +13716,8 @@ static void lay_down_rc_track_diag_left_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16663,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16663, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -23168,9 +13731,7 @@ static void lay_down_rc_track_diag_left_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -23185,24 +13746,12 @@ static void lay_down_rc_track_diag_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26872,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26872, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -23211,24 +13760,12 @@ static void lay_down_rc_track_diag_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26869,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26869, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -23237,24 +13774,12 @@ static void lay_down_rc_track_diag_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26871,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26871, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -23263,26 +13788,15 @@ static void lay_down_rc_track_diag_left_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26870,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26870, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -23311,11 +13825,7 @@ static void lay_down_rc_track_diag_left_bank(
 
 /** rct2: 0x00824EDC */
 static void lay_down_rc_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -23327,24 +13837,12 @@ static void lay_down_rc_track_diag_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16663,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16663, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -23353,24 +13851,12 @@ static void lay_down_rc_track_diag_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16664,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16664, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -23379,24 +13865,12 @@ static void lay_down_rc_track_diag_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16662,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16662, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -23409,18 +13883,8 @@ static void lay_down_rc_track_diag_right_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16665,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16665, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -23434,9 +13898,7 @@ static void lay_down_rc_track_diag_right_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -23451,24 +13913,12 @@ static void lay_down_rc_track_diag_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26870,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26870, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -23477,24 +13927,12 @@ static void lay_down_rc_track_diag_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26871,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26871, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -23503,24 +13941,12 @@ static void lay_down_rc_track_diag_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26869,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26869, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -23529,26 +13955,15 @@ static void lay_down_rc_track_diag_right_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26872,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26872, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -23577,11 +13992,7 @@ static void lay_down_rc_track_diag_right_bank(
 
 /** rct2: 0x00824FAC */
 static void lay_down_rc_track_left_flyer_twist_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -23616,8 +14027,7 @@ static void lay_down_rc_track_left_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -23625,17 +14035,7 @@ static void lay_down_rc_track_left_flyer_twist_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26973,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26973, 0, 6, 32, 20, 3, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 1:
@@ -23655,8 +14055,7 @@ static void lay_down_rc_track_left_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -23664,17 +14063,7 @@ static void lay_down_rc_track_left_flyer_twist_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26974,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26974, 0, 6, 32, 20, 3, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 1:
@@ -23695,8 +14084,7 @@ static void lay_down_rc_track_left_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -23716,11 +14104,7 @@ static void lay_down_rc_track_left_flyer_twist_up(
 
 /** rct2: 0x00824FBC */
 static void lay_down_rc_track_right_flyer_twist_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -23755,8 +14139,7 @@ static void lay_down_rc_track_right_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -23783,8 +14166,7 @@ static void lay_down_rc_track_right_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -23812,8 +14194,7 @@ static void lay_down_rc_track_right_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -23833,11 +14214,7 @@ static void lay_down_rc_track_right_flyer_twist_up(
 
 /** rct2: 0x00824FCC */
 static void lay_down_rc_track_left_flyer_twist_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -23855,17 +14232,7 @@ static void lay_down_rc_track_left_flyer_twist_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26974,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26974, 0, 6, 32, 20, 3, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 3:
@@ -23878,8 +14245,7 @@ static void lay_down_rc_track_left_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -23902,17 +14268,7 @@ static void lay_down_rc_track_left_flyer_twist_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26973,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26973, 0, 6, 32, 20, 3, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 3:
@@ -23924,8 +14280,7 @@ static void lay_down_rc_track_left_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -23963,8 +14318,7 @@ static void lay_down_rc_track_left_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -23972,11 +14326,7 @@ static void lay_down_rc_track_left_flyer_twist_down(
 
 /** rct2: 0x00824FDC */
 static void lay_down_rc_track_right_flyer_twist_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -24006,8 +14356,7 @@ static void lay_down_rc_track_right_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 33, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -24041,8 +14390,7 @@ static void lay_down_rc_track_right_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -24080,8 +14428,7 @@ static void lay_down_rc_track_right_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -24089,11 +14436,7 @@ static void lay_down_rc_track_right_flyer_twist_down(
 
 /** rct2: 0x00824C3C */
 static void lay_down_rc_track_flyer_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -24139,34 +14482,14 @@ static void lay_down_rc_track_flyer_half_loop_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16603,
-                        0,
-                        14,
-                        3,
-                        20,
-                        63,
-                        height,
-                        28,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16603, 0, 14, 3, 20, 63, height, 28, 6,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES_INVERTED, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16600,
-                        0,
-                        6,
-                        3,
-                        20,
-                        63,
-                        height,
-                        28,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16600, 0, 6, 3, 20, 63, height, 28, 6,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -24190,17 +14513,7 @@ static void lay_down_rc_track_flyer_half_loop_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16604,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16604, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 2:
@@ -24209,17 +14522,7 @@ static void lay_down_rc_track_flyer_half_loop_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16607,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        15,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16607, 16, 16, 2, 16, 119, height, 15, 6,
                         height);
                     break;
             }
@@ -24227,8 +14530,7 @@ static void lay_down_rc_track_flyer_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 168, 0x20);
             break;
         case 3:
@@ -24264,11 +14566,7 @@ static void lay_down_rc_track_flyer_half_loop_up(
 
 /** rct2: 0x00824C4C */
 static void lay_down_rc_track_flyer_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -24310,17 +14608,7 @@ static void lay_down_rc_track_flyer_half_loop_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16604,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16604, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 2:
@@ -24329,17 +14617,7 @@ static void lay_down_rc_track_flyer_half_loop_down(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16607,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        15,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16607, 16, 16, 2, 16, 119, height, 15, 6,
                         height);
                     break;
             }
@@ -24347,8 +14625,7 @@ static void lay_down_rc_track_flyer_half_loop_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 168, 0x20);
             break;
         case 2:
@@ -24362,34 +14639,14 @@ static void lay_down_rc_track_flyer_half_loop_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16603,
-                        0,
-                        14,
-                        3,
-                        20,
-                        63,
-                        height,
-                        28,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16603, 0, 14, 3, 20, 63, height, 28, 6,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES_INVERTED, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16600,
-                        0,
-                        6,
-                        3,
-                        20,
-                        63,
-                        height,
-                        28,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16600, 0, 6, 3, 20, 63, height, 28, 6,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES_INVERTED, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -24439,11 +14696,7 @@ static void lay_down_rc_track_flyer_half_loop_down(
 
 /** rct2: 0x00824C5C */
 static void lay_down_rc_track_left_flyer_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -24453,62 +14706,22 @@ static void lay_down_rc_track_left_flyer_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16610,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16610, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16613,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16613, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16616,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16616, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16619,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16619, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
             }
@@ -24518,8 +14731,7 @@ static void lay_down_rc_track_left_flyer_corkscrew_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
             }
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -24528,8 +14740,7 @@ static void lay_down_rc_track_left_flyer_corkscrew_up(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
             }
 
             if (direction == 0 || direction == 3)
@@ -24543,62 +14754,22 @@ static void lay_down_rc_track_left_flyer_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16611,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16611, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16614,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16614, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16617,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16617, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16620,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16620, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
             }
@@ -24610,71 +14781,29 @@ static void lay_down_rc_track_left_flyer_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16612,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16612, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16615,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16615, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16618,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16618, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16621,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16621, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 35, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -24694,11 +14823,7 @@ static void lay_down_rc_track_left_flyer_corkscrew_up(
 
 /** rct2: 0x00824C6C */
 static void lay_down_rc_track_right_flyer_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -24708,62 +14833,22 @@ static void lay_down_rc_track_right_flyer_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16622,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16622, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16625,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16625, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16628,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16628, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16631,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16631, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
             }
@@ -24774,10 +14859,8 @@ static void lay_down_rc_track_right_flyer_corkscrew_up(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 1:
@@ -24785,62 +14868,22 @@ static void lay_down_rc_track_right_flyer_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16623,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16623, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16626,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16626, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16629,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16629, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16632,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16632, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
             }
@@ -24852,71 +14895,29 @@ static void lay_down_rc_track_right_flyer_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16624,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16624, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16627,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16627, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16630,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16630, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16633,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16633, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 35, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -24936,11 +14937,7 @@ static void lay_down_rc_track_right_flyer_corkscrew_up(
 
 /** rct2: 0x00824C7C */
 static void lay_down_rc_track_left_flyer_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -24950,71 +14947,29 @@ static void lay_down_rc_track_left_flyer_corkscrew_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16627,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16627, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16630,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16630, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16633,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16633, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16624,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16624, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 24);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 35, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -25029,62 +14984,22 @@ static void lay_down_rc_track_left_flyer_corkscrew_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16626,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16626, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16629,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16629, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16632,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16632, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16623,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16623, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
             }
@@ -25096,62 +15011,22 @@ static void lay_down_rc_track_left_flyer_corkscrew_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16625,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16625, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 4);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16628,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16628, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 4);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16631,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16631, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 4);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16622,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16622, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 4);
                     break;
             }
@@ -25167,10 +15042,8 @@ static void lay_down_rc_track_left_flyer_corkscrew_down(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
     }
@@ -25178,11 +15051,7 @@ static void lay_down_rc_track_left_flyer_corkscrew_down(
 
 /** rct2: 0x00824C8C */
 static void lay_down_rc_track_right_flyer_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lay_down_rc_track_left_flyer_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 3) % 4, height, tileElement);
@@ -25190,11 +15059,7 @@ static void lay_down_rc_track_right_flyer_corkscrew_down(
 
 /** rct2: 0x00824FEC */
 static void lay_down_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -25226,33 +15091,13 @@ static void lay_down_rc_track_block_brakes(
             case 0:
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26559,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26559, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 1:
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26560,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26560, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
         }
@@ -25271,11 +15116,7 @@ static void lay_down_rc_track_block_brakes(
 }
 
 static void lay_down_rc_track_left_quarter_banked_helix_large_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -25285,71 +15126,29 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27118,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27118, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27123,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27123, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27128,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27128, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27113,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27113, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -25367,62 +15166,22 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27117,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27117, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27122,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27122, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27127,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27127, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27112,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27112, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
             }
@@ -25430,8 +15189,7 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -25439,62 +15197,22 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27116,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27116, 0, 0, 16, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27121,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27121, 0, 0, 16, 16, 3, height + 24, 16, 16,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27126,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27126, 0, 0, 16, 16, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27111,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27111, 0, 0, 16, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
             }
@@ -25510,62 +15228,22 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27115,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27115, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27120,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27120, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27125,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27125, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27110,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27110, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
             }
@@ -25573,8 +15251,7 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -25582,71 +15259,29 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27114,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27114, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27119,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27119, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27124,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27124, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27109,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27109, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 51, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -25665,11 +15300,7 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_up(
 }
 
 static void lay_down_rc_track_right_quarter_banked_helix_large_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -25679,71 +15310,29 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27089,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27089, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27094,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27094, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27099,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27099, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27104,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27104, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 30);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -25761,62 +15350,22 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27090,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27090, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27095,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27095, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27100,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27100, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27105,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27105, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
             }
@@ -25824,8 +15373,7 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -25833,62 +15381,22 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27091,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27091, 0, 0, 16, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27096,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27096, 0, 0, 16, 16, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27101,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27101, 0, 0, 16, 16, 3, height + 24, 16, 16,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27106,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27106, 0, 0, 16, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
             }
@@ -25904,62 +15412,22 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27092,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27092, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27097,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27097, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27102,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27102, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27107,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27107, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
             }
@@ -25967,8 +15435,7 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -25976,71 +15443,29 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27093,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27093, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27098,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27098, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27103,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27103, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27108,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27108, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 38);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 51, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -26059,11 +15484,7 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_up(
 }
 
 static void lay_down_rc_track_left_quarter_banked_helix_large_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -26073,71 +15494,29 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27098,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27098, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27103,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27103, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27108,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27108, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27093,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27093, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 51, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -26155,62 +15534,22 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27097,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27097, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27102,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27102, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27107,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27107, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27092,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27092, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
             }
@@ -26218,8 +15557,7 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -26227,62 +15565,22 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27096,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27096, 0, 0, 16, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27101,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27101, 0, 0, 16, 16, 3, height + 24, 16, 16,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27106,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27106, 0, 0, 16, 16, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27091,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27091, 0, 0, 16, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
             }
@@ -26298,62 +15596,22 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27095,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27095, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27100,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27100, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27105,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27105, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27090,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27090, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
             }
@@ -26361,8 +15619,7 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -26370,71 +15627,29 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27094,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27094, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27099,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27099, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27104,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27104, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27089,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27089, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -26453,11 +15668,7 @@ static void lay_down_rc_track_left_quarter_banked_helix_large_down(
 }
 
 static void lay_down_rc_track_right_quarter_banked_helix_large_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -26467,71 +15678,29 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27109,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27109, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27114,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27114, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27119,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27119, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27124,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27124, 0, 0, 32, 20, 3, height + 24, 0, 6,
                         height + 38);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 51, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -26549,62 +15718,22 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27110,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27110, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27115,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27115, 0, 0, 32, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27120,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27120, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27125,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27125, 0, 0, 32, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
             }
@@ -26612,8 +15741,7 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -26621,62 +15749,22 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27111,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27111, 0, 0, 16, 16, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27116,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27116, 0, 0, 16, 16, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27121,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27121, 0, 0, 16, 16, 3, height + 24, 16, 16,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27126,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27126, 0, 0, 16, 16, 3, height + 24, 0, 16,
                         height + 38);
                     break;
             }
@@ -26692,62 +15780,22 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27112,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27112, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27117,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27117, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27122,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27122, 0, 0, 16, 32, 3, height + 24, 0, 0,
                         height + 38);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27127,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27127, 0, 0, 16, 32, 3, height + 24, 16, 0,
                         height + 38);
                     break;
             }
@@ -26755,8 +15803,7 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -26764,71 +15811,29 @@ static void lay_down_rc_track_right_quarter_banked_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27113,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27113, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27118,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27118, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27123,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27123, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 27128,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 24,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 27128, 0, 0, 20, 32, 3, height + 24, 6, 0,
                         height + 30);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 39, session->TrackColours[SCHEME_SUPPORTS]);
 
diff --git a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp
index a55ddab13a..d20275e24b 100644
--- a/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/LimLaunchedRollerCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x008A6D50, 0x008A6D60, 0x008A6D70 */
 static void lim_launched_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -38,33 +34,13 @@ static void lim_launched_rc_track_station(
     if (track_element_get_type(tileElement) == TRACK_ELEM_END_STATION)
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            1,
-            height,
-            0,
-            6,
+            session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
             height + 3);
     }
     else
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            1,
-            height,
-            0,
-            6,
+            session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
             height + 3);
     }
     sub_98196C_rotated(
@@ -78,11 +54,7 @@ static void lim_launched_rc_track_station(
 
 /** rct2: 0x008A65E0 */
 static void lim_launched_rc_track_left_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -123,8 +95,7 @@ static void lim_launched_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 56, 0x20);
             break;
         case 1:
@@ -151,8 +122,7 @@ static void lim_launched_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 2:
@@ -160,62 +130,22 @@ static void lim_launched_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15390,
-                        16,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15390, 16, 0, 3, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15398,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15398, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15393,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15393, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15401,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15401, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
             }
@@ -247,8 +177,7 @@ static void lim_launched_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 4:
@@ -281,8 +210,7 @@ static void lim_launched_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 7:
@@ -290,62 +218,22 @@ static void lim_launched_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15393,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15393, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15401,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15401, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15390,
-                        16,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15390, 16, 0, 3, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15398,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15398, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
             }
@@ -377,8 +265,7 @@ static void lim_launched_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 9:
@@ -422,8 +309,7 @@ static void lim_launched_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 56, 0x20);
             break;
     }
@@ -431,11 +317,7 @@ static void lim_launched_rc_track_left_vertical_loop(
 
 /** rct2: 0x008A65F0 */
 static void lim_launched_rc_track_right_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -494,62 +376,22 @@ static void lim_launched_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15417,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15417, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15409,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15409, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15414,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15414, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15406,
-                        16,
-                        0,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15406, 16, 0, 2, 16, 119, height, 16, 0,
                         height);
                     break;
             }
@@ -610,62 +452,22 @@ static void lim_launched_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15414,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15414, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15406,
-                        16,
-                        0,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15406, 16, 0, 2, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15417,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15417, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15409,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15409, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
             }
@@ -732,11 +534,7 @@ static void lim_launched_rc_track_right_vertical_loop(
 
 /** rct2: 0x008A6D10 */
 static void lim_launched_rc_track_left_twist_down_to_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -748,68 +546,28 @@ static void lim_launched_rc_track_left_twist_down_to_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15758, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15782,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15782, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15761, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15785,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15785, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15764, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15788,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15788, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15767, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15791,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15791, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
             }
@@ -819,10 +577,8 @@ static void lim_launched_rc_track_left_twist_down_to_up(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -832,68 +588,28 @@ static void lim_launched_rc_track_left_twist_down_to_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15759, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15783,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15783, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15762, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15786,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15786, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15765, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15789,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15789, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15768, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15792,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15792, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
             }
@@ -901,8 +617,7 @@ static void lim_launched_rc_track_left_twist_down_to_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -912,68 +627,28 @@ static void lim_launched_rc_track_left_twist_down_to_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15760, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15784,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15784, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15763, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15787,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15787, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15766, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15790,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15790, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15769, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15793,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15793, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
             }
@@ -987,10 +662,8 @@ static void lim_launched_rc_track_left_twist_down_to_up(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height, 0x20);
             break;
     }
@@ -998,11 +671,7 @@ static void lim_launched_rc_track_left_twist_down_to_up(
 
 /** rct2: 0x008A6D20 */
 static void lim_launched_rc_track_right_twist_down_to_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1014,68 +683,28 @@ static void lim_launched_rc_track_right_twist_down_to_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15770, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15794,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15794, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15773, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15797,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15797, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15776, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15800,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15800, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15779, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15803,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15803, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
             }
@@ -1085,10 +714,8 @@ static void lim_launched_rc_track_right_twist_down_to_up(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -1098,68 +725,28 @@ static void lim_launched_rc_track_right_twist_down_to_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15771, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15795,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15795, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15774, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15798,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15798, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15777, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15801,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15801, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15780, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15804,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15804, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
             }
@@ -1167,8 +754,7 @@ static void lim_launched_rc_track_right_twist_down_to_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -1178,68 +764,28 @@ static void lim_launched_rc_track_right_twist_down_to_up(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15772, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15796,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15796, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15775, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15799,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15799, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15778, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15802,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15802, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15781, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15805,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15805, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
             }
@@ -1253,10 +799,8 @@ static void lim_launched_rc_track_right_twist_down_to_up(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height, 0x20);
             break;
     }
@@ -1264,11 +808,7 @@ static void lim_launched_rc_track_right_twist_down_to_up(
 
 /** rct2: 0x008A6D30 */
 static void lim_launched_rc_track_left_twist_up_to_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1280,68 +820,28 @@ static void lim_launched_rc_track_left_twist_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15766, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15790,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15790, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15769, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15793,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15793, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15760, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15784,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15784, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15763, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15787,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15787, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
             }
@@ -1350,10 +850,8 @@ static void lim_launched_rc_track_left_twist_up_to_down(
                 paint_util_push_tunnel_rotated(session, direction, height - 32, TUNNEL_3);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height, 0x20);
             break;
         case 1:
@@ -1363,68 +861,28 @@ static void lim_launched_rc_track_left_twist_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15765, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15789,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15789, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15768, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15792,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15792, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15759, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15783,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15783, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15762, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15786,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15786, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
             }
@@ -1432,8 +890,7 @@ static void lim_launched_rc_track_left_twist_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -1443,68 +900,28 @@ static void lim_launched_rc_track_left_twist_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15764, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15788,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15788, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15767, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15791,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15791, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15758, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15782,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15782, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15761, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15785,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15785, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
             }
@@ -1519,10 +936,8 @@ static void lim_launched_rc_track_left_twist_up_to_down(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -1530,11 +945,7 @@ static void lim_launched_rc_track_left_twist_up_to_down(
 
 /** rct2: 0x008A6D40 */
 static void lim_launched_rc_track_right_twist_up_to_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1546,68 +957,28 @@ static void lim_launched_rc_track_right_twist_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15778, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15802,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15802, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15781, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15805,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15805, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15772, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15796,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15796, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15775, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15799,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15799, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 44);
                     break;
             }
@@ -1616,10 +987,8 @@ static void lim_launched_rc_track_right_twist_up_to_down(
                 paint_util_push_tunnel_rotated(session, direction, height + 32, TUNNEL_3);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 1:
@@ -1629,68 +998,28 @@ static void lim_launched_rc_track_right_twist_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15777, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15801,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15801, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15780, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15804,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15804, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15771, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15795,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15795, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15774, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15798,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15798, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
             }
@@ -1698,8 +1027,7 @@ static void lim_launched_rc_track_right_twist_up_to_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -1709,68 +1037,28 @@ static void lim_launched_rc_track_right_twist_up_to_down(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15776, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15800,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15800, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15779, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15803,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15803, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15770, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15794,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15794, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15773, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15797,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15797, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 28);
                     break;
             }
@@ -1785,10 +1073,8 @@ static void lim_launched_rc_track_right_twist_up_to_down(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -1796,11 +1082,7 @@ static void lim_launched_rc_track_right_twist_up_to_down(
 
 /** rct2: 0x008A6CD0 */
 static void lim_launched_rc_track_left_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1810,62 +1092,22 @@ static void lim_launched_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15734,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15734, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15737,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15737, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15740,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15740, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15743,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15743, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
             }
@@ -1883,62 +1125,22 @@ static void lim_launched_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15735,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15735, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15738,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15738, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15741,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15741, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15744,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15744, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
             }
@@ -1950,71 +1152,29 @@ static void lim_launched_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15736,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15736, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15739,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15739, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15742,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15742, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15745,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15745, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 35, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2034,11 +1194,7 @@ static void lim_launched_rc_track_left_corkscrew_up(
 
 /** rct2: 0x008A6CE0 */
 static void lim_launched_rc_track_right_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2048,62 +1204,22 @@ static void lim_launched_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15746,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15746, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15749,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15749, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15752,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15752, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15755,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15755, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
             }
@@ -2113,10 +1229,8 @@ static void lim_launched_rc_track_right_corkscrew_up(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 1:
@@ -2124,62 +1238,22 @@ static void lim_launched_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15747,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15747, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15750,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15750, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15753,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15753, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15756,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15756, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
             }
@@ -2191,71 +1265,29 @@ static void lim_launched_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15748,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15748, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15751,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15751, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15754,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15754, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15757,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15757, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 35, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2275,11 +1307,7 @@ static void lim_launched_rc_track_right_corkscrew_up(
 
 /** rct2: 0x008A6CF0 */
 static void lim_launched_rc_track_left_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lim_launched_rc_track_right_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, tileElement);
@@ -2287,11 +1315,7 @@ static void lim_launched_rc_track_left_corkscrew_down(
 
 /** rct2: 0x008A6D00 */
 static void lim_launched_rc_track_right_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lim_launched_rc_track_left_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, tileElement);
@@ -2299,11 +1323,7 @@ static void lim_launched_rc_track_right_corkscrew_down(
 
 /** rct2: 0x008A6D80 */
 static void lim_launched_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -2331,11 +1351,7 @@ static void lim_launched_rc_track_brakes(
 
 /** rct2: 0x008A6C10 */
 static void lim_launched_rc_track_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2345,62 +1361,22 @@ static void lim_launched_rc_track_90_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15702,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15702, 0, 0, 2, 20, 31, height, 4, 6,
                         height + 8);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15703,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15703, 0, 0, 2, 20, 31, height, 24, 6,
                         height + 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15704,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15704, 0, 0, 2, 20, 31, height, 24, 6,
                         height + 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15705,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15705, 0, 0, 2, 20, 31, height, 4, 6,
                         height + 8);
                     break;
             }
@@ -2416,11 +1392,7 @@ static void lim_launched_rc_track_90_deg_up(
 
 /** rct2: 0x008A6C20 */
 static void lim_launched_rc_track_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lim_launched_rc_track_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -2428,11 +1400,7 @@ static void lim_launched_rc_track_90_deg_down(
 
 /** rct2: 0x008A6C30 */
 static void lim_launched_rc_track_60_deg_up_to_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2446,32 +1414,12 @@ static void lim_launched_rc_track_60_deg_up_to_90_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15695,
-                        0,
-                        0,
-                        2,
-                        20,
-                        55,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15695, 0, 0, 2, 20, 55, height, 24, 6,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15696,
-                        0,
-                        0,
-                        2,
-                        20,
-                        55,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15696, 0, 0, 2, 20, 55, height, 24, 6,
                         height);
                     break;
                 case 3:
@@ -2495,11 +1443,7 @@ static void lim_launched_rc_track_60_deg_up_to_90_deg_up(
 
 /** rct2: 0x008A6C40 */
 static void lim_launched_rc_track_90_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lim_launched_rc_track_60_deg_up_to_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -2507,11 +1451,7 @@ static void lim_launched_rc_track_90_deg_down_to_60_deg_down(
 
 /** rct2: 0x008A6C50 */
 static void lim_launched_rc_track_90_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -2549,11 +1489,7 @@ static void lim_launched_rc_track_90_deg_up_to_60_deg_up(
 
 /** rct2: 0x008A6C60 */
 static void lim_launched_rc_track_60_deg_down_to_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2563,62 +1499,22 @@ static void lim_launched_rc_track_60_deg_down_to_90_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15700,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        39,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15700, 0, 0, 2, 20, 31, height, 39, 6,
                         height + 8);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15701,
-                        0,
-                        0,
-                        6,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15701, 0, 0, 6, 20, 3, height, 0, 6,
                         height + 2);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15698,
-                        0,
-                        0,
-                        6,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15698, 0, 0, 6, 20, 3, height, 0, 6,
                         height + 2);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15699,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        39,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15699, 0, 0, 2, 20, 31, height, 39, 6,
                         height + 8);
                     break;
             }
@@ -2637,11 +1533,7 @@ static void lim_launched_rc_track_60_deg_down_to_90_deg_down(
 
 /** rct2: 0x008A6C70 */
 static void lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2651,62 +1543,22 @@ static void lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15722,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15722, 0, 0, 2, 20, 31, height, 4, 6,
                         height + 8);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15725,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15725, 0, 0, 2, 20, 31, height, 24, 6,
                         height + 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15728,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15728, 0, 0, 2, 20, 31, height, 24, 6,
                         height + 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15731,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15731, 0, 0, 2, 20, 31, height, 4, 6,
                         height + 8);
                     break;
             }
@@ -2719,62 +1571,22 @@ static void lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15723,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        -8,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15723, 0, 0, 2, 20, 31, height, -8, 6,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15726,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15726, 0, 0, 2, 20, 63, height, 24, 6,
                         height + 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15729,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15729, 0, 0, 2, 20, 63, height, 24, 6,
                         height + 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15732,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        -8,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15732, 0, 0, 2, 20, 31, height, -8, 6,
                         height);
                     break;
             }
@@ -2787,62 +1599,22 @@ static void lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15724,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15724, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15727,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15727, 0, 0, 2, 20, 31, height, 24, 6,
                         height + 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15730,
-                        0,
-                        0,
-                        2,
-                        20,
-                        31,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15730, 0, 0, 2, 20, 31, height, 24, 6,
                         height + 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15733,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15733, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 24);
                     break;
             }
@@ -2859,11 +1631,7 @@ static void lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(
 
 /** rct2: 0x008A6C80 */
 static void lim_launched_rc_track_inverted_flat_to_90_deg_quarter_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lim_launched_rc_track_90_deg_to_inverted_flat_quarter_loop_up(
@@ -2872,11 +1640,7 @@ static void lim_launched_rc_track_inverted_flat_to_90_deg_quarter_loop_down(
 
 /** rct2: 0x008A6D90 */
 static void lim_launched_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -2903,11 +1667,7 @@ static void lim_launched_rc_track_block_brakes(
 }
 
 static void lim_launched_rc_track_left_quarter_turn_1_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2917,88 +1677,28 @@ static void lim_launched_rc_track_left_quarter_turn_1_90_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15706,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15706, 0, 0, 2, 20, 63, height, 4, 6,
                         height + 8);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15707,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15707, 0, 0, 2, 20, 63, height, 4, 6,
                         height + 8);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15715,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15715, 0, 0, 2, 20, 63, height, 24, 6,
                         height + 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15716,
-                        0,
-                        0,
-                        2,
-                        2,
-                        63,
-                        height,
-                        24,
-                        24,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15716, 0, 0, 2, 2, 63, height, 24, 24,
                         height + 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15709,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15709, 0, 0, 2, 20, 63, height, 4, 6,
                         height + 8);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15717,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15717, 0, 0, 2, 20, 63, height, 24, 6,
                         height + 8);
                     break;
             }
@@ -3014,11 +1714,7 @@ static void lim_launched_rc_track_left_quarter_turn_1_90_deg_up(
 
 /** rct2: 0x008A6CA0 */
 static void lim_launched_rc_track_right_quarter_turn_1_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3028,88 +1724,28 @@ static void lim_launched_rc_track_right_quarter_turn_1_90_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15710,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15710, 0, 0, 2, 20, 63, height, 4, 6,
                         height + 8);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15718,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15718, 0, 0, 2, 20, 63, height, 24, 6,
                         height + 8);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15719,
-                        0,
-                        0,
-                        2,
-                        2,
-                        63,
-                        height,
-                        24,
-                        24,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15719, 0, 0, 2, 2, 63, height, 24, 24,
                         height + 8);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15712,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15712, 0, 0, 2, 20, 63, height, 4, 6,
                         height + 8);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15720,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        24,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15720, 0, 0, 2, 20, 63, height, 24, 6,
                         height + 8);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15713,
-                        0,
-                        0,
-                        2,
-                        20,
-                        63,
-                        height,
-                        4,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15713, 0, 0, 2, 20, 63, height, 4, 6,
                         height + 8);
                     break;
             }
@@ -3125,11 +1761,7 @@ static void lim_launched_rc_track_right_quarter_turn_1_90_deg_up(
 
 /** rct2: 0x008A6CB0 */
 static void lim_launched_rc_track_left_quarter_turn_1_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lim_launched_rc_track_right_quarter_turn_1_90_deg_up(
@@ -3138,11 +1770,7 @@ static void lim_launched_rc_track_left_quarter_turn_1_90_deg_down(
 
 /** rct2: 0x008A6CC0 */
 static void lim_launched_rc_track_right_quarter_turn_1_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     lim_launched_rc_track_left_quarter_turn_1_90_deg_up(
diff --git a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp
index e74bb26fda..37b26b781b 100644
--- a/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/LoopingRollerCoaster.cpp
@@ -24,11 +24,7 @@
 
 /** rct2: 0x008A6370 */
 static void looping_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -84,11 +80,7 @@ static void looping_rc_track_flat(
 }
 
 static void looping_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const uint32_t stationTrackNESW = is_csg_loaded() ? LOOPING_RC_BOOSTER_NE_SW : 15016;
@@ -102,17 +94,7 @@ static void looping_rc_track_station(
     };
 
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-        0,
-        0,
-        32,
-        20,
-        1,
-        height,
-        0,
-        6,
+        session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
         height + 3);
     sub_98196C_rotated(
         session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
@@ -125,11 +107,7 @@ static void looping_rc_track_station(
 
 /** rct2: 0x008A6380 */
 static void looping_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -199,11 +177,7 @@ static void looping_rc_track_25_deg_up(
 
 /** rct2: 0x008A6390 */
 static void looping_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -273,11 +247,7 @@ static void looping_rc_track_60_deg_up(
 
 /** rct2: 0x008A63A0 */
 static void looping_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -347,11 +317,7 @@ static void looping_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x008A63B0 */
 static void looping_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -429,11 +395,7 @@ static void looping_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008A63C0 */
 static void looping_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -511,11 +473,7 @@ static void looping_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A63D0 */
 static void looping_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -585,11 +543,7 @@ static void looping_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x008A63E0 */
 static void looping_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -597,11 +551,7 @@ static void looping_rc_track_25_deg_down(
 
 /** rct2: 0x008A63F0 */
 static void looping_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -609,11 +559,7 @@ static void looping_rc_track_60_deg_down(
 
 /** rct2: 0x008A6400 */
 static void looping_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -621,11 +567,7 @@ static void looping_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008A6410 */
 static void looping_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -633,11 +575,7 @@ static void looping_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008A6420 */
 static void looping_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -645,11 +583,7 @@ static void looping_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A6430 */
 static void looping_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -657,11 +591,7 @@ static void looping_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x008A6440 */
 static void looping_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -711,32 +641,12 @@ static void looping_rc_track_left_quarter_turn_5(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15192,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15192, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15177,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15177, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -744,8 +654,7 @@ static void looping_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -753,47 +662,17 @@ static void looping_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15181,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15181, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15186,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15186, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15191,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15191, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -813,17 +692,7 @@ static void looping_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15180,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15180, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -836,17 +705,7 @@ static void looping_rc_track_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15175,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15175, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -854,8 +713,7 @@ static void looping_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -897,11 +755,7 @@ static void looping_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x008A6450 */
 static void looping_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -910,11 +764,7 @@ static void looping_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x008A6460 */
 static void looping_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -952,11 +802,7 @@ static void looping_rc_track_flat_to_left_bank(
 
 /** rct2: 0x008A6470 */
 static void looping_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -994,11 +840,7 @@ static void looping_rc_track_flat_to_right_bank(
 
 /** rct2: 0x008A6480 */
 static void looping_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1036,11 +878,7 @@ static void looping_rc_track_left_bank_to_flat(
 
 /** rct2: 0x008A6490 */
 static void looping_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1078,11 +916,7 @@ static void looping_rc_track_right_bank_to_flat(
 
 /** rct2: 0x008A64A0 */
 static void looping_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1094,32 +928,12 @@ static void looping_rc_track_banked_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15203, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15214,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15214, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15208,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15208, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -1152,47 +966,17 @@ static void looping_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15207,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15207, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15212,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15212, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15197,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15197, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -1200,8 +984,7 @@ static void looping_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -1209,47 +992,17 @@ static void looping_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15201,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15201, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15206,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15206, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15211,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15211, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -1269,32 +1022,12 @@ static void looping_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15200,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15200, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15205,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15205, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -1303,17 +1036,7 @@ static void looping_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15195,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15195, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -1321,8 +1044,7 @@ static void looping_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -1334,34 +1056,14 @@ static void looping_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15204,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15204, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15209, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15215,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15215, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -1388,11 +1090,7 @@ static void looping_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x008A64B0 */
 static void looping_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1401,11 +1099,7 @@ static void looping_rc_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x008A64C0 */
 static void looping_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1450,11 +1144,7 @@ static void looping_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x008A64D0 */
 static void looping_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1499,11 +1189,7 @@ static void looping_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x008A64E0 */
 static void looping_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1548,11 +1234,7 @@ static void looping_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x008A64F0 */
 static void looping_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1597,11 +1279,7 @@ static void looping_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x008A6500 */
 static void looping_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1609,11 +1287,7 @@ static void looping_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x008A6510 */
 static void looping_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1621,11 +1295,7 @@ static void looping_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x008A6520 */
 static void looping_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1633,11 +1303,7 @@ static void looping_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x008A6530 */
 static void looping_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1645,11 +1311,7 @@ static void looping_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x008A6540 */
 static void looping_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1683,11 +1345,7 @@ static void looping_rc_track_left_bank(
 
 /** rct2: 0x008A6550 */
 static void looping_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1695,11 +1353,7 @@ static void looping_rc_track_right_bank(
 
 /** rct2: 0x008A6560 */
 static void looping_rc_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1749,32 +1403,12 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15307,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15307, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15312,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15312, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -1782,8 +1416,7 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -1791,47 +1424,17 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15298,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15298, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15303,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15303, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15308,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15308, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -1851,17 +1454,7 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15299,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15299, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -1874,17 +1467,7 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15314,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15314, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -1892,8 +1475,7 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -1935,11 +1517,7 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A6570 */
 static void looping_rc_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1981,32 +1559,12 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15277,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15277, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15282,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15282, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -2022,8 +1580,7 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -2035,47 +1592,17 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15283,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15283, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15288,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15288, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15293,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15293, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -2091,17 +1618,7 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15279,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15279, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -2114,17 +1631,7 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15294,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15294, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -2132,8 +1639,7 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -2175,11 +1681,7 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A6580 */
 static void looping_rc_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2189,11 +1691,7 @@ static void looping_rc_track_left_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A6590 */
 static void looping_rc_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2202,11 +1700,7 @@ static void looping_rc_track_right_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A65A0 */
 static void looping_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2268,8 +1762,7 @@ static void looping_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2300,8 +1793,7 @@ static void looping_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2343,11 +1835,7 @@ static void looping_rc_track_s_bend_left(
 
 /** rct2: 0x008A65B0 */
 static void looping_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2409,8 +1897,7 @@ static void looping_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2441,8 +1928,7 @@ static void looping_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2484,11 +1970,7 @@ static void looping_rc_track_s_bend_right(
 
 /** rct2: 0x008A65C0 */
 static void looping_rc_track_left_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2521,8 +2003,7 @@ static void looping_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 56, 0x20);
             break;
         case 1:
@@ -2549,8 +2030,7 @@ static void looping_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 2:
@@ -2558,122 +2038,42 @@ static void looping_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15350,
-                        16,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15350, 16, 0, 3, 16, 119, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK_CENTRED, 1, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15364,
-                        16,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15364, 16, 0, 3, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15358,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15358, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK_ALT_CENTRED, 0, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15366,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15366, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15353,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15353, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK, 2, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15365,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15365, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15361,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15361, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK_ALT, 3, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15367,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15367, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
             }
@@ -2705,8 +2105,7 @@ static void looping_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 4:
@@ -2739,8 +2138,7 @@ static void looping_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 7:
@@ -2748,122 +2146,42 @@ static void looping_rc_track_left_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15353,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15353, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK, 2, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15365,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15365, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15361,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15361, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK_ALT, 3, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15367,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15367, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15350,
-                        16,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15350, 16, 0, 3, 16, 119, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK_CENTRED, 1, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15364,
-                        16,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15364, 16, 0, 3, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15358,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15358, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK_ALT_CENTRED, 0, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15366,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15366, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
             }
@@ -2895,8 +2213,7 @@ static void looping_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 9:
@@ -2932,8 +2249,7 @@ static void looping_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 56, 0x20);
             break;
     }
@@ -2941,11 +2257,7 @@ static void looping_rc_track_left_vertical_loop(
 
 /** rct2: 0x008A65D0 */
 static void looping_rc_track_right_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3003,122 +2315,42 @@ static void looping_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15381,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15381, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK, 3, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15384,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15384, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15373,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15373, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK_ALT, 1, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15386,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15386, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15378,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15378, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK_CENTRED, 0, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15385,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15385, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15370,
-                        16,
-                        0,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15370, 16, 0, 2, 16, 119, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK_ALT_CENTRED, 2, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15387,
-                        16,
-                        0,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15387, 16, 0, 2, 16, 119, height, 16, 0,
                         height);
                     break;
             }
@@ -3179,122 +2411,42 @@ static void looping_rc_track_right_vertical_loop(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15378,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15378, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK_CENTRED, 0, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15385,
-                        12,
-                        0,
-                        3,
-                        16,
-                        119,
-                        height,
-                        12,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15385, 12, 0, 3, 16, 119, height, 12, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15370,
-                        16,
-                        0,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15370, 16, 0, 2, 16, 119, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK_ALT_CENTRED, 2, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15387,
-                        16,
-                        0,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15387, 16, 0, 2, 16, 119, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15381,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15381, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK, 3, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15384,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15384, 16, 16, 2, 16, 119, height, 16, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15373,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15373, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_THICK_ALT, 1, 0, height - 8, session->TrackColours[SCHEME_TRACK]);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15386,
-                        10,
-                        16,
-                        4,
-                        16,
-                        119,
-                        height,
-                        10,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15386, 10, 16, 4, 16, 119, height, 10, 16,
                         height);
                     break;
             }
@@ -3360,11 +2512,7 @@ static void looping_rc_track_right_vertical_loop(
 
 /** rct2: 0x008A6630 */
 static void looping_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3406,17 +2554,7 @@ static void looping_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15124,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15124, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -3425,32 +2563,12 @@ static void looping_rc_track_left_quarter_turn_3(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15130,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15130, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15121,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15121, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -3497,11 +2615,7 @@ static void looping_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x008A6640 */
 static void looping_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3510,11 +2624,7 @@ static void looping_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x008A6650 */
 static void looping_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3526,32 +2636,12 @@ static void looping_rc_track_left_quarter_turn_3_bank(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15137, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15144,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15144, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15140,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15140, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -3580,62 +2670,22 @@ static void looping_rc_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15136,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15136, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15139,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15139, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15142,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15142, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15133,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15133, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -3652,34 +2702,14 @@ static void looping_rc_track_left_quarter_turn_3_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15138,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15138, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15141, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15145,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15145, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -3706,11 +2736,7 @@ static void looping_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x008A6660 */
 static void looping_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3719,11 +2745,7 @@ static void looping_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x008A6670 */
 static void looping_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3802,11 +2824,7 @@ static void looping_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A6680 */
 static void looping_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3892,11 +2910,7 @@ static void looping_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A6690 */
 static void looping_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3906,11 +2920,7 @@ static void looping_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A66A0 */
 static void looping_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3919,11 +2929,7 @@ static void looping_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A66B0 */
 static void looping_rc_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3935,32 +2941,12 @@ static void looping_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15165, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15172,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15172, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15168,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15168, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -3978,10 +2964,8 @@ static void looping_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -3992,62 +2976,22 @@ static void looping_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15164,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15164, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15167,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15167, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15170,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15170, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15161,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15161, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -4064,34 +3008,14 @@ static void looping_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15166,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15166, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15169, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15173,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15173, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4110,10 +3034,8 @@ static void looping_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -4127,32 +3049,12 @@ static void looping_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15165, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15172,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15172, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15168,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15168, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4171,10 +3073,8 @@ static void looping_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -4185,62 +3085,22 @@ static void looping_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15161,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15161, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15164,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15164, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15167,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15167, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15170,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15170, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4261,34 +3121,14 @@ static void looping_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15166,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15166, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15169, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15173,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15173, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -4298,10 +3138,8 @@ static void looping_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -4309,11 +3147,7 @@ static void looping_rc_track_left_half_banked_helix_up_small(
 
 /** rct2: 0x008A66C0 */
 static void looping_rc_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4331,34 +3165,14 @@ static void looping_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15152,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15152, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15155, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15159,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15159, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -4368,10 +3182,8 @@ static void looping_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -4382,62 +3194,22 @@ static void looping_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15147,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15147, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15150,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15150, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15153,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15153, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15156,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15156, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4456,32 +3228,12 @@ static void looping_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15151, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15158,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15158, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15154,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15154, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4500,10 +3252,8 @@ static void looping_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -4515,34 +3265,14 @@ static void looping_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15152,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15152, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15155, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15159,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15159, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4561,10 +3291,8 @@ static void looping_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -4575,62 +3303,22 @@ static void looping_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15150,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15150, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15153,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15153, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15156,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15156, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15147,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15147, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -4645,32 +3333,12 @@ static void looping_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15151, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15158,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15158, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15154,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15154, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -4688,10 +3356,8 @@ static void looping_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -4699,11 +3365,7 @@ static void looping_rc_track_right_half_banked_helix_up_small(
 
 /** rct2: 0x008A66D0 */
 static void looping_rc_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -4718,11 +3380,7 @@ static void looping_rc_track_left_half_banked_helix_down_small(
 
 /** rct2: 0x008A66E0 */
 static void looping_rc_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -4737,11 +3395,7 @@ static void looping_rc_track_right_half_banked_helix_down_small(
 
 /** rct2: 0x008A66F0 */
 static void looping_rc_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4753,32 +3407,12 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15247, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15258,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15258, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15252,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15252, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -4796,10 +3430,8 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -4814,47 +3446,17 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15251,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15251, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15256,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15256, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15241,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15241, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -4862,8 +3464,7 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -4871,47 +3472,17 @@ static void looping_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15245,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15245, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15250,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15250, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15255,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15255, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -4931,32 +3502,12 @@ static void looping_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15244,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15244, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15249,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15249, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -4965,17 +3516,7 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15239,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15239, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4983,8 +3524,7 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -4996,34 +3536,14 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15248,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15248, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15253, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15259,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15259, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -5042,10 +3562,8 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -5059,32 +3577,12 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15247, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15258,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15258, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15252,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15252, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -5103,10 +3601,8 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -5117,17 +3613,7 @@ static void looping_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15241,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15241, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -5136,32 +3622,12 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15251,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15251, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15256,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15256, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -5169,8 +3635,7 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -5182,47 +3647,17 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15245,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15245, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15250,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15250, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15255,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15255, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5238,47 +3673,17 @@ static void looping_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15239,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15239, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15244,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15244, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15249,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15249, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -5290,8 +3695,7 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -5307,34 +3711,14 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15248,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15248, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15253, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15259,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15259, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -5344,10 +3728,8 @@ static void looping_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -5355,11 +3737,7 @@ static void looping_rc_track_left_half_banked_helix_up_large(
 
 /** rct2: 0x008A6700 */
 static void looping_rc_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5377,34 +3755,14 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15226,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15226, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15231, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15237,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15237, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -5414,10 +3772,8 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -5428,47 +3784,17 @@ static void looping_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15217,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15217, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15222,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15222, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15227,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15227, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -5480,8 +3806,7 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -5493,47 +3818,17 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15223,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15223, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15228,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15228, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15233,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15233, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5549,17 +3844,7 @@ static void looping_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15219,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15219, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -5568,32 +3853,12 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15229,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15229, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15234,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15234, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -5601,8 +3866,7 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -5616,32 +3880,12 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15225, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15236,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15236, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15230,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15230, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -5660,10 +3904,8 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -5675,34 +3917,14 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15226,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15226, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15231, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15237,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15237, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -5721,10 +3943,8 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -5735,32 +3955,12 @@ static void looping_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15222,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15222, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15227,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15227, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -5769,17 +3969,7 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15217,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15217, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -5787,8 +3977,7 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -5796,47 +3985,17 @@ static void looping_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15223,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15223, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15228,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15228, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15233,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15233, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -5860,47 +4019,17 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15229,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15229, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15234,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15234, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15219,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15219, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5908,8 +4037,7 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -5919,32 +4047,12 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 15225, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15236,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15236, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15230,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15230, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -5962,10 +4070,8 @@ static void looping_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -5973,11 +4079,7 @@ static void looping_rc_track_right_half_banked_helix_up_large(
 
 /** rct2: 0x008A6710 */
 static void looping_rc_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -5992,11 +4094,7 @@ static void looping_rc_track_left_half_banked_helix_down_large(
 
 /** rct2: 0x008A6720 */
 static void looping_rc_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -6011,11 +4109,7 @@ static void looping_rc_track_right_half_banked_helix_down_large(
 
 /** rct2: 0x008A6750 */
 static void looping_rc_track_left_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -6052,11 +4146,7 @@ static void looping_rc_track_left_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008A6730 */
 static void looping_rc_track_right_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -6093,11 +4183,7 @@ static void looping_rc_track_right_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008A6740 */
 static void looping_rc_track_left_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_right_quarter_turn_1_60_deg_up(
@@ -6106,11 +4192,7 @@ static void looping_rc_track_left_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008A6760 */
 static void looping_rc_track_right_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement);
@@ -6118,11 +4200,7 @@ static void looping_rc_track_right_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008A6770 */
 static void looping_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -6154,11 +4232,7 @@ static void looping_rc_track_brakes(
 
 /** rct2: 0x008A6A40 */
 static void looping_rc_track_25_deg_up_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -6199,11 +4273,7 @@ static void looping_rc_track_25_deg_up_left_banked(
 
 /** rct2: 0x008A6A50 */
 static void looping_rc_track_25_deg_up_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -6244,11 +4314,7 @@ static void looping_rc_track_25_deg_up_right_banked(
 
 /** rct2: 0x008A6780 */
 static void looping_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -6294,11 +4360,7 @@ static void looping_rc_track_on_ride_photo(
 
 /** rct2: 0x008A6A60 */
 static void looping_rc_track_25_deg_down_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -6306,11 +4368,7 @@ static void looping_rc_track_25_deg_down_left_banked(
 
 /** rct2: 0x008A6A70 */
 static void looping_rc_track_25_deg_down_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -6318,11 +4376,7 @@ static void looping_rc_track_25_deg_down_right_banked(
 
 /** rct2: 0x008A6860 */
 static void looping_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6369,32 +4423,12 @@ static void looping_rc_track_left_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15535,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15535, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15539,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15539, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -6402,8 +4436,7 @@ static void looping_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -6411,47 +4444,17 @@ static void looping_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15528,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15528, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15532,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15532, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15536,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15536, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -6460,10 +4463,8 @@ static void looping_rc_track_left_eighth_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -6476,34 +4477,14 @@ static void looping_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15529,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15529, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15533,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15533, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6516,17 +4497,7 @@ static void looping_rc_track_left_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15541,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15541, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6536,8 +4507,7 @@ static void looping_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -6545,11 +4515,7 @@ static void looping_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x008A6870 */
 static void looping_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6588,32 +4554,12 @@ static void looping_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15511,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15511, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15515,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15515, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -6629,8 +4575,7 @@ static void looping_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -6642,17 +4587,7 @@ static void looping_rc_track_right_eighth_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15516,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15516, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
@@ -6661,25 +4596,13 @@ static void looping_rc_track_right_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15524,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15524, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -6692,17 +4615,7 @@ static void looping_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15513,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15513, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6715,34 +4628,14 @@ static void looping_rc_track_right_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15521,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15521, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15525,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15525, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6752,8 +4645,7 @@ static void looping_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -6761,11 +4653,7 @@ static void looping_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x008A6880 */
 static void looping_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -6774,11 +4662,7 @@ static void looping_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008A6890 */
 static void looping_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -6787,11 +4671,7 @@ static void looping_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008A68A0 */
 static void looping_rc_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6801,32 +4681,12 @@ static void looping_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15558,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15558, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15562,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15562, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -6856,47 +4716,17 @@ static void looping_rc_track_left_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15563,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15563, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15567,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15567, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15571,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15571, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -6904,8 +4734,7 @@ static void looping_rc_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -6913,47 +4742,17 @@ static void looping_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15560,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15560, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15564,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15564, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15568,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15568, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -6962,10 +4761,8 @@ static void looping_rc_track_left_eighth_bank_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -6978,34 +4775,14 @@ static void looping_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15561,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15561, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15565,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15565, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7018,17 +4795,7 @@ static void looping_rc_track_left_eighth_bank_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15573,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15573, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7038,8 +4805,7 @@ static void looping_rc_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -7047,11 +4813,7 @@ static void looping_rc_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x008A68B0 */
 static void looping_rc_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7069,32 +4831,12 @@ static void looping_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15550,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15550, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15554,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15554, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -7112,47 +4854,17 @@ static void looping_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15543,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15543, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15547,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15547, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15551,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15551, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -7164,8 +4876,7 @@ static void looping_rc_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -7177,55 +4888,23 @@ static void looping_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15548,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15548, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15552,
-                        0,
-                        0,
-                        28,
-                        28,
-                        0,
-                        height,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15552, 0, 0, 28, 28, 0, height, 4, 4,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15556,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15556, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -7238,17 +4917,7 @@ static void looping_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15545,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15545, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7261,34 +4930,14 @@ static void looping_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15553,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15553, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15557,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15557, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7298,8 +4947,7 @@ static void looping_rc_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -7307,11 +4955,7 @@ static void looping_rc_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x008A68C0 */
 static void looping_rc_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -7320,11 +4964,7 @@ static void looping_rc_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008A68D0 */
 static void looping_rc_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -7333,11 +4973,7 @@ static void looping_rc_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008A6790 */
 static void looping_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7349,18 +4985,8 @@ static void looping_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15451,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15451, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7370,18 +4996,8 @@ static void looping_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15423,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15423, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7396,18 +5012,8 @@ static void looping_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15448,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15448, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7417,18 +5023,8 @@ static void looping_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15420,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15420, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7443,18 +5039,8 @@ static void looping_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15450,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15450, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7464,18 +5050,8 @@ static void looping_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15422,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15422, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7494,18 +5070,8 @@ static void looping_rc_track_diag_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15449,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15449, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7529,18 +5095,8 @@ static void looping_rc_track_diag_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15421,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15421, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7563,11 +5119,7 @@ static void looping_rc_track_diag_flat(
 
 /** rct2: 0x008A67C0 */
 static void looping_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7579,18 +5131,8 @@ static void looping_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15463,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15463, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7600,18 +5142,8 @@ static void looping_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15435,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15435, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7626,18 +5158,8 @@ static void looping_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15460,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15460, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7647,18 +5169,8 @@ static void looping_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15432,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15432, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7673,18 +5185,8 @@ static void looping_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15462,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15462, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7694,18 +5196,8 @@ static void looping_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15434,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15434, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7724,18 +5216,8 @@ static void looping_rc_track_diag_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15461,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15461, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7759,18 +5241,8 @@ static void looping_rc_track_diag_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15433,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15433, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7793,11 +5265,7 @@ static void looping_rc_track_diag_25_deg_up(
 
 /** rct2: 0x008A67F0 */
 static void looping_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7809,18 +5277,8 @@ static void looping_rc_track_diag_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15475,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15475, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7830,18 +5288,8 @@ static void looping_rc_track_diag_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15447,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15447, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7856,18 +5304,8 @@ static void looping_rc_track_diag_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15472,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15472, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7877,18 +5315,8 @@ static void looping_rc_track_diag_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15444,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15444, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7903,18 +5331,8 @@ static void looping_rc_track_diag_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15474,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15474, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7924,18 +5342,8 @@ static void looping_rc_track_diag_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15446,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15446, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7954,18 +5362,8 @@ static void looping_rc_track_diag_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15473,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15473, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 36, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7989,18 +5387,8 @@ static void looping_rc_track_diag_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15445,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15445, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 36, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8023,11 +5411,7 @@ static void looping_rc_track_diag_60_deg_up(
 
 /** rct2: 0x008A67A0 */
 static void looping_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8039,18 +5423,8 @@ static void looping_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15455,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15455, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8060,18 +5434,8 @@ static void looping_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15427,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15427, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8086,18 +5450,8 @@ static void looping_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15452,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15452, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8107,18 +5461,8 @@ static void looping_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15424,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15424, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8133,18 +5477,8 @@ static void looping_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15454,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15454, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8154,18 +5488,8 @@ static void looping_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15426,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15426, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8184,18 +5508,8 @@ static void looping_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15453,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15453, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8219,18 +5533,8 @@ static void looping_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15425,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15425, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8253,11 +5557,7 @@ static void looping_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008A67D0 */
 static void looping_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8269,18 +5569,8 @@ static void looping_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15467,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15467, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8290,18 +5580,8 @@ static void looping_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15439,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15439, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8316,18 +5596,8 @@ static void looping_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15464,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15464, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8337,18 +5607,8 @@ static void looping_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15436,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15436, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8363,18 +5623,8 @@ static void looping_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15466,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15466, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8384,18 +5634,8 @@ static void looping_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15438,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15438, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8414,18 +5654,8 @@ static void looping_rc_track_diag_25_deg_up_to_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15465,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15465, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8449,18 +5679,8 @@ static void looping_rc_track_diag_25_deg_up_to_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15437,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15437, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8483,11 +5703,7 @@ static void looping_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008A67E0 */
 static void looping_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8499,18 +5715,8 @@ static void looping_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15471,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15471, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8520,18 +5726,8 @@ static void looping_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15443,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15443, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8546,18 +5742,8 @@ static void looping_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15468,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15468, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8567,18 +5753,8 @@ static void looping_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15440,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15440, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8593,18 +5769,8 @@ static void looping_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15470,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15470, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8614,18 +5780,8 @@ static void looping_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15442,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15442, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8644,17 +5800,7 @@ static void looping_rc_track_diag_60_deg_up_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15469,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15469, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 21, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8679,17 +5825,7 @@ static void looping_rc_track_diag_60_deg_up_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15441,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15441, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 21, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8713,11 +5849,7 @@ static void looping_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A67B0 */
 static void looping_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8729,18 +5861,8 @@ static void looping_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15459,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15459, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8750,18 +5872,8 @@ static void looping_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15431,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15431, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8776,18 +5888,8 @@ static void looping_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15456,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15456, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8797,18 +5899,8 @@ static void looping_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15428,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15428, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8823,18 +5915,8 @@ static void looping_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15458,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15458, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8844,18 +5926,8 @@ static void looping_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15430,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15430, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8874,18 +5946,8 @@ static void looping_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15457,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15457, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8909,18 +5971,8 @@ static void looping_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15429,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15429, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8943,11 +5995,7 @@ static void looping_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008A6820 */
 static void looping_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8959,18 +6007,8 @@ static void looping_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15461,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15461, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8980,18 +6018,8 @@ static void looping_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15433,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15433, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9006,18 +6034,8 @@ static void looping_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15462,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15462, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9027,18 +6045,8 @@ static void looping_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15434,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15434, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9053,18 +6061,8 @@ static void looping_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15460,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15460, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9074,18 +6072,8 @@ static void looping_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15432,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15432, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9104,18 +6092,8 @@ static void looping_rc_track_diag_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15463,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15463, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9139,18 +6117,8 @@ static void looping_rc_track_diag_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15435,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15435, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9173,11 +6141,7 @@ static void looping_rc_track_diag_25_deg_down(
 
 /** rct2: 0x008A6850 */
 static void looping_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9189,18 +6153,8 @@ static void looping_rc_track_diag_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15473,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15473, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9210,18 +6164,8 @@ static void looping_rc_track_diag_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15445,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15445, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9236,18 +6180,8 @@ static void looping_rc_track_diag_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15474,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15474, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9257,18 +6191,8 @@ static void looping_rc_track_diag_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15446,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15446, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9283,18 +6207,8 @@ static void looping_rc_track_diag_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15472,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15472, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9304,18 +6218,8 @@ static void looping_rc_track_diag_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15444,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15444, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9334,18 +6238,8 @@ static void looping_rc_track_diag_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15475,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15475, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 28, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9369,18 +6263,8 @@ static void looping_rc_track_diag_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15447,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15447, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 28, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9403,11 +6287,7 @@ static void looping_rc_track_diag_60_deg_down(
 
 /** rct2: 0x008A6800 */
 static void looping_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9419,18 +6299,8 @@ static void looping_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15457,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15457, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9440,18 +6310,8 @@ static void looping_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15429,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15429, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9465,18 +6325,8 @@ static void looping_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15458,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15458, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9486,18 +6336,8 @@ static void looping_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15430,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15430, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9511,18 +6351,8 @@ static void looping_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15456,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15456, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9532,18 +6362,8 @@ static void looping_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15428,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15428, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9561,18 +6381,8 @@ static void looping_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15459,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15459, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9596,18 +6406,8 @@ static void looping_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15431,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15431, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9631,11 +6431,7 @@ static void looping_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008A6830 */
 static void looping_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9647,17 +6443,7 @@ static void looping_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15469,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15469, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
@@ -9668,17 +6454,7 @@ static void looping_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15441,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15441, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
@@ -9694,18 +6470,8 @@ static void looping_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15470,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15470, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9715,18 +6481,8 @@ static void looping_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15442,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15442, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9741,18 +6497,8 @@ static void looping_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15468,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15468, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9762,18 +6508,8 @@ static void looping_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15440,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15440, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9792,18 +6528,8 @@ static void looping_rc_track_diag_25_deg_down_to_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15471,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15471, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 17, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9827,18 +6553,8 @@ static void looping_rc_track_diag_25_deg_down_to_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15443,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15443, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 17, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9861,11 +6577,7 @@ static void looping_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008A6840 */
 static void looping_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9877,18 +6589,8 @@ static void looping_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15465,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15465, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9898,18 +6600,8 @@ static void looping_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15437,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15437, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9924,18 +6616,8 @@ static void looping_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15466,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15466, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9945,18 +6627,8 @@ static void looping_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15438,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15438, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9971,18 +6643,8 @@ static void looping_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15464,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15464, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9992,18 +6654,8 @@ static void looping_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15436,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15436, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10022,18 +6674,8 @@ static void looping_rc_track_diag_60_deg_down_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15467,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15467, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10057,18 +6699,8 @@ static void looping_rc_track_diag_60_deg_down_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15439,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15439, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10091,11 +6723,7 @@ static void looping_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A6810 */
 static void looping_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10107,18 +6735,8 @@ static void looping_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15453,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15453, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10128,18 +6746,8 @@ static void looping_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15425,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15425, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10154,18 +6762,8 @@ static void looping_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15454,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15454, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10175,18 +6773,8 @@ static void looping_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15426,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15426, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10201,18 +6789,8 @@ static void looping_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15452,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15452, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10222,18 +6800,8 @@ static void looping_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15424,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15424, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10252,18 +6820,8 @@ static void looping_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15455,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15455, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10287,18 +6845,8 @@ static void looping_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15427,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15427, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10321,11 +6869,7 @@ static void looping_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x008A6900 */
 static void looping_rc_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10335,17 +6879,7 @@ static void looping_rc_track_diag_flat_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15503,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15503, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10358,30 +6892,10 @@ static void looping_rc_track_diag_flat_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15500,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15500, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15504,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15504, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -10394,17 +6908,7 @@ static void looping_rc_track_diag_flat_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15502,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15502, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10421,17 +6925,7 @@ static void looping_rc_track_diag_flat_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15501,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15501, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10454,11 +6948,7 @@ static void looping_rc_track_diag_flat_to_left_bank(
 
 /** rct2: 0x008A6910 */
 static void looping_rc_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10468,17 +6958,7 @@ static void looping_rc_track_diag_flat_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15508,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15508, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10491,17 +6971,7 @@ static void looping_rc_track_diag_flat_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15505,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15505, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10514,30 +6984,10 @@ static void looping_rc_track_diag_flat_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15507,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15507, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15509,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15509, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -10554,17 +7004,7 @@ static void looping_rc_track_diag_flat_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15506,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15506, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10587,11 +7027,7 @@ static void looping_rc_track_diag_flat_to_right_bank(
 
 /** rct2: 0x008A6920 */
 static void looping_rc_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10601,17 +7037,7 @@ static void looping_rc_track_diag_left_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15506,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15506, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10624,30 +7050,10 @@ static void looping_rc_track_diag_left_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15507,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15507, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15509,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15509, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -10660,17 +7066,7 @@ static void looping_rc_track_diag_left_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15505,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15505, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10687,17 +7083,7 @@ static void looping_rc_track_diag_left_bank_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15508,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15508, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10720,11 +7106,7 @@ static void looping_rc_track_diag_left_bank_to_flat(
 
 /** rct2: 0x008A6930 */
 static void looping_rc_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10734,17 +7116,7 @@ static void looping_rc_track_diag_right_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15501,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15501, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10757,17 +7129,7 @@ static void looping_rc_track_diag_right_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15502,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15502, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10780,30 +7142,10 @@ static void looping_rc_track_diag_right_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15500,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15500, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15504,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15504, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -10820,17 +7162,7 @@ static void looping_rc_track_diag_right_bank_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15503,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15503, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10853,11 +7185,7 @@ static void looping_rc_track_diag_right_bank_to_flat(
 
 /** rct2: 0x008A6960 */
 static void looping_rc_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10867,17 +7195,7 @@ static void looping_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15493,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15493, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10890,30 +7208,10 @@ static void looping_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15490,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15490, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15494,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15494, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -10926,17 +7224,7 @@ static void looping_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15492,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15492, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10953,17 +7241,7 @@ static void looping_rc_track_diag_left_bank_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15491,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15491, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10986,11 +7264,7 @@ static void looping_rc_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x008A6970 */
 static void looping_rc_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11000,17 +7274,7 @@ static void looping_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15498,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15498, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11023,17 +7287,7 @@ static void looping_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15495,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15495, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11046,30 +7300,10 @@ static void looping_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15497,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15497, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15499,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15499, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11086,17 +7320,7 @@ static void looping_rc_track_diag_right_bank_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15496,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15496, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11119,11 +7343,7 @@ static void looping_rc_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x008A6940 */
 static void looping_rc_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11133,17 +7353,7 @@ static void looping_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15483,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15483, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11156,30 +7366,10 @@ static void looping_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15480,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15480, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15484,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15484, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11192,17 +7382,7 @@ static void looping_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15482,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15482, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11219,17 +7399,7 @@ static void looping_rc_track_diag_25_deg_up_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15481,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15481, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11252,11 +7422,7 @@ static void looping_rc_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x008A6950 */
 static void looping_rc_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11266,17 +7432,7 @@ static void looping_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15488,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15488, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11289,17 +7445,7 @@ static void looping_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15485,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15485, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11312,30 +7458,10 @@ static void looping_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15487,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15487, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15489,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15489, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11352,17 +7478,7 @@ static void looping_rc_track_diag_25_deg_up_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15486,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15486, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11385,11 +7501,7 @@ static void looping_rc_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x008A6980 */
 static void looping_rc_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11399,17 +7511,7 @@ static void looping_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15486,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15486, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11421,30 +7523,10 @@ static void looping_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15487,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15487, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15489,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15489, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11456,17 +7538,7 @@ static void looping_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15485,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15485, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11482,17 +7554,7 @@ static void looping_rc_track_diag_left_bank_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15488,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15488, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11516,11 +7578,7 @@ static void looping_rc_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x008A6990 */
 static void looping_rc_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11530,17 +7588,7 @@ static void looping_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15481,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15481, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11552,17 +7600,7 @@ static void looping_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15482,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15482, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11574,30 +7612,10 @@ static void looping_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15480,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15480, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15484,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15484, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11613,17 +7631,7 @@ static void looping_rc_track_diag_right_bank_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15483,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15483, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11647,11 +7655,7 @@ static void looping_rc_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x008A69A0 */
 static void looping_rc_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11661,17 +7665,7 @@ static void looping_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15496,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15496, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11684,30 +7678,10 @@ static void looping_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15497,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15497, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15499,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15499, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11720,17 +7694,7 @@ static void looping_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15495,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15495, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11747,17 +7711,7 @@ static void looping_rc_track_diag_25_deg_down_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15498,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15498, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11780,11 +7734,7 @@ static void looping_rc_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x008A69B0 */
 static void looping_rc_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11794,17 +7744,7 @@ static void looping_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15491,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15491, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11817,17 +7757,7 @@ static void looping_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15492,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15492, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11840,30 +7770,10 @@ static void looping_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15490,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15490, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15494,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15494, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11880,17 +7790,7 @@ static void looping_rc_track_diag_25_deg_down_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15493,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15493, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11913,11 +7813,7 @@ static void looping_rc_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x008A68E0 */
 static void looping_rc_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11927,17 +7823,7 @@ static void looping_rc_track_diag_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15479,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15479, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11950,17 +7836,7 @@ static void looping_rc_track_diag_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15476,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15476, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -11973,17 +7849,7 @@ static void looping_rc_track_diag_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15478,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15478, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12000,17 +7866,7 @@ static void looping_rc_track_diag_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15477,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15477, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12033,11 +7889,7 @@ static void looping_rc_track_diag_left_bank(
 
 /** rct2: 0x008A68F0 */
 static void looping_rc_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12047,17 +7899,7 @@ static void looping_rc_track_diag_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15477,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15477, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12070,17 +7912,7 @@ static void looping_rc_track_diag_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15478,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15478, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12093,17 +7925,7 @@ static void looping_rc_track_diag_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15476,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15476, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -12120,17 +7942,7 @@ static void looping_rc_track_diag_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15479,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15479, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12153,11 +7965,7 @@ static void looping_rc_track_diag_right_bank(
 
 /** rct2: 0x008A6C00 */
 static void looping_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12189,11 +7997,7 @@ static void looping_rc_track_block_brakes(
 
 /** rct2: 0x008A6BC0 */
 static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12207,17 +8011,7 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15691,
-                        0,
-                        6,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15691, 0, 6, 32, 1, 34, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -12253,32 +8047,12 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15690,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15690, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15692,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15692, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -12305,11 +8079,7 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A6BD0 */
 static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12327,17 +8097,7 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15682,
-                        0,
-                        6,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15682, 0, 6, 32, 1, 34, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -12371,34 +8131,14 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15681,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15681, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15683,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15683, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 4, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12428,11 +8168,7 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A6BE0 */
 static void looping_rc_track_left_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -12442,11 +8178,7 @@ static void looping_rc_track_left_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A6BF0 */
 static void looping_rc_track_right_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -12456,11 +8188,7 @@ static void looping_rc_track_right_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A6B80 */
 static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12474,17 +8202,7 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15663,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15663, 0, 0, 32, 1, 34, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -12517,47 +8235,17 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15664,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15664, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15669,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15669, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15674,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15674, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -12565,8 +8253,7 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -12574,47 +8261,17 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15660,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15660, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15665,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15665, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15670,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15670, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -12634,62 +8291,22 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15661,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15661, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15666,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15666, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15671,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15671, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15676,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15676, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -12697,8 +8314,7 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -12710,32 +8326,12 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15667,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15667, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15672,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15672, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -12762,11 +8358,7 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A6B90 */
 static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12784,17 +8376,7 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15648,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15648, 0, 0, 32, 1, 34, height, 0, 27,
                         height);
                     break;
                 case 3:
@@ -12819,47 +8401,17 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15639,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15639, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15644,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15644, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15649,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15649, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 3:
@@ -12871,8 +8423,7 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -12884,47 +8435,17 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15645,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15645, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15650,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15650, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15655,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15655, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -12940,62 +8461,22 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15641,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15641, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15646,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15646, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15651,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15651, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15656,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15656, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -13003,8 +8484,7 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -13016,32 +8496,12 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15647,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15647, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 15652,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 15652, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -13068,11 +8528,7 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A6BA0 */
 static void looping_rc_track_left_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -13082,11 +8538,7 @@ static void looping_rc_track_left_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A6BB0 */
 static void looping_rc_track_right_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -13096,11 +8548,7 @@ static void looping_rc_track_right_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A6A80 */
 static void looping_rc_track_25_deg_up_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13143,11 +8591,7 @@ static void looping_rc_track_25_deg_up_to_left_banked_25_deg_up(
 
 /** rct2: 0x008A6A90 */
 static void looping_rc_track_25_deg_up_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13190,11 +8634,7 @@ static void looping_rc_track_25_deg_up_to_right_banked_25_deg_up(
 
 /** rct2: 0x008A6AA0 */
 static void looping_rc_track_left_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13237,11 +8677,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A6AB0 */
 static void looping_rc_track_right_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13284,11 +8720,7 @@ static void looping_rc_track_right_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A6AC0 */
 static void looping_rc_track_25_deg_down_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_right_banked_25_deg_up_to_25_deg_up(
@@ -13297,11 +8729,7 @@ static void looping_rc_track_25_deg_down_to_left_banked_25_deg_down(
 
 /** rct2: 0x008A6AD0 */
 static void looping_rc_track_25_deg_down_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_left_banked_25_deg_up_to_25_deg_up(
@@ -13310,11 +8738,7 @@ static void looping_rc_track_25_deg_down_to_right_banked_25_deg_down(
 
 /** rct2: 0x008A6AE0 */
 static void looping_rc_track_left_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_25_deg_up_to_right_banked_25_deg_up(
@@ -13323,11 +8747,7 @@ static void looping_rc_track_left_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A6AF0 */
 static void looping_rc_track_right_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_25_deg_up_to_left_banked_25_deg_up(
@@ -13336,11 +8756,7 @@ static void looping_rc_track_right_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A6B00 */
 static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13381,11 +8797,7 @@ static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x008A6B10 */
 static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13426,11 +8838,7 @@ static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x008A6B40 */
 static void looping_rc_track_left_banked_25_deg_up_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13471,11 +8879,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_left_banked_flat(
 
 /** rct2: 0x008A6B50 */
 static void looping_rc_track_right_banked_25_deg_up_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13516,11 +8920,7 @@ static void looping_rc_track_right_banked_25_deg_up_to_right_banked_flat(
 
 /** rct2: 0x008A6B60 */
 static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_right_banked_25_deg_up_to_right_banked_flat(
@@ -13529,11 +8929,7 @@ static void looping_rc_track_left_banked_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x008A6B70 */
 static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_left_banked_25_deg_up_to_left_banked_flat(
@@ -13542,11 +8938,7 @@ static void looping_rc_track_right_banked_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x008A6B20 */
 static void looping_rc_track_left_banked_25_deg_down_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_right_banked_flat_to_right_banked_25_deg_up(
@@ -13555,11 +8947,7 @@ static void looping_rc_track_left_banked_25_deg_down_to_left_banked_flat(
 
 /** rct2: 0x008A6B30 */
 static void looping_rc_track_right_banked_25_deg_down_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_left_banked_flat_to_left_banked_25_deg_up(
@@ -13568,11 +8956,7 @@ static void looping_rc_track_right_banked_25_deg_down_to_right_banked_flat(
 
 /** rct2: 0x008A69C0 */
 static void looping_rc_track_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13615,11 +8999,7 @@ static void looping_rc_track_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x008A69D0 */
 static void looping_rc_track_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13662,11 +9042,7 @@ static void looping_rc_track_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x008A69E0 */
 static void looping_rc_track_left_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13709,11 +9085,7 @@ static void looping_rc_track_left_banked_25_deg_up_to_flat(
 
 /** rct2: 0x008A69F0 */
 static void looping_rc_track_right_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -13756,11 +9128,7 @@ static void looping_rc_track_right_banked_25_deg_up_to_flat(
 
 /** rct2: 0x008A6A00 */
 static void looping_rc_track_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_right_banked_25_deg_up_to_flat(
@@ -13769,11 +9137,7 @@ static void looping_rc_track_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x008A6A10 */
 static void looping_rc_track_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -13781,11 +9145,7 @@ static void looping_rc_track_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x008A6A20 */
 static void looping_rc_track_left_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_flat_to_right_banked_25_deg_up(
@@ -13794,22 +9154,14 @@ static void looping_rc_track_left_banked_25_deg_down_to_flat(
 
 /** rct2: 0x008A6A30 */
 static void looping_rc_track_right_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     looping_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void looping_rc_track_booster(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!is_csg_loaded())
@@ -13823,34 +9175,14 @@ static void looping_rc_track_booster(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | LOOPING_RC_BOOSTER_NE_SW,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height,
-                0,
-                6,
-                height);
+                session, direction, session->TrackColours[SCHEME_TRACK] | LOOPING_RC_BOOSTER_NE_SW, 0, 0, 32, 20, 3, height, 0,
+                6, height);
             break;
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | LOOPING_RC_BOOSTER_NW_SE,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height,
-                0,
-                6,
-                height);
+                session, direction, session->TrackColours[SCHEME_TRACK] | LOOPING_RC_BOOSTER_NW_SE, 0, 0, 32, 20, 3, height, 0,
+                6, height);
             break;
     }
     if (track_paint_util_should_paint_supports(session->MapPosition))
diff --git a/src/openrct2/ride/coaster/MineRide.cpp b/src/openrct2/ride/coaster/MineRide.cpp
index 21b78a33c5..df61919456 100644
--- a/src/openrct2/ride/coaster/MineRide.cpp
+++ b/src/openrct2/ride/coaster/MineRide.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x008B08D0 */
 static void mine_ride_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -58,11 +54,7 @@ static void mine_ride_track_flat(
 }
 
 static void mine_ride_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -73,17 +65,7 @@ static void mine_ride_track_station(
     };
 
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-        0,
-        0,
-        32,
-        20,
-        1,
-        height,
-        0,
-        6,
+        session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
         height + 3);
     sub_98196C_rotated(
         session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
@@ -96,11 +78,7 @@ static void mine_ride_track_station(
 
 /** rct2: 0x008B08E0 */
 static void mine_ride_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -157,11 +135,7 @@ static void mine_ride_track_25_deg_up(
 
 /** rct2: 0x008B08F0 */
 static void mine_ride_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -218,11 +192,7 @@ static void mine_ride_track_flat_to_25_deg_up(
 
 /** rct2: 0x008B0900 */
 static void mine_ride_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -279,11 +249,7 @@ static void mine_ride_track_25_deg_up_to_flat(
 
 /** rct2: 0x008B0910 */
 static void mine_ride_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_ride_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -291,11 +257,7 @@ static void mine_ride_track_25_deg_down(
 
 /** rct2: 0x008B0920 */
 static void mine_ride_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_ride_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -303,11 +265,7 @@ static void mine_ride_track_flat_to_25_deg_down(
 
 /** rct2: 0x008B0930 */
 static void mine_ride_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_ride_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -315,11 +273,7 @@ static void mine_ride_track_25_deg_down_to_flat(
 
 /** rct2: 0x008B0940 */
 static void mine_ride_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -376,32 +330,12 @@ static void mine_ride_track_left_quarter_turn_5(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19436,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19436, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19421,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19421, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -409,8 +343,7 @@ static void mine_ride_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -418,47 +351,17 @@ static void mine_ride_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19425,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19425, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19430,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19430, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19435,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19435, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -478,17 +381,7 @@ static void mine_ride_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19424,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19424, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -501,17 +394,7 @@ static void mine_ride_track_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19419,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19419, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -519,8 +402,7 @@ static void mine_ride_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -569,11 +451,7 @@ static void mine_ride_track_left_quarter_turn_5(
 
 /** rct2: 0x008B0950 */
 static void mine_ride_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -582,11 +460,7 @@ static void mine_ride_track_right_quarter_turn_5(
 
 /** rct2: 0x008B0960 */
 static void mine_ride_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -640,11 +514,7 @@ static void mine_ride_track_flat_to_left_bank(
 
 /** rct2: 0x008B0970 */
 static void mine_ride_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -698,11 +568,7 @@ static void mine_ride_track_flat_to_right_bank(
 
 /** rct2: 0x008B0980 */
 static void mine_ride_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -756,11 +622,7 @@ static void mine_ride_track_left_bank_to_flat(
 
 /** rct2: 0x008B0990 */
 static void mine_ride_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -814,11 +676,7 @@ static void mine_ride_track_right_bank_to_flat(
 
 /** rct2: 0x008B09A0 */
 static void mine_ride_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -830,34 +688,14 @@ static void mine_ride_track_banked_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19447, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19458,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19458, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19452,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19452, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -895,47 +733,17 @@ static void mine_ride_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19451,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19451, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19456,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19456, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19441,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19441, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -943,8 +751,7 @@ static void mine_ride_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -952,47 +759,17 @@ static void mine_ride_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19445,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19445, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19450,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19450, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19455,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19455, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -1012,32 +789,12 @@ static void mine_ride_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19444,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19444, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19449,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19449, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -1046,17 +803,7 @@ static void mine_ride_track_banked_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19439,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19439, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -1064,8 +811,7 @@ static void mine_ride_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -1079,17 +825,7 @@ static void mine_ride_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19448,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19448, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -1098,17 +834,7 @@ static void mine_ride_track_banked_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19453, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19459,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19459, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -1138,11 +864,7 @@ static void mine_ride_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x008B09B0 */
 static void mine_ride_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1151,11 +873,7 @@ static void mine_ride_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x008B09C0 */
 static void mine_ride_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1216,11 +934,7 @@ static void mine_ride_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x008B09D0 */
 static void mine_ride_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1281,11 +995,7 @@ static void mine_ride_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x008B09E0 */
 static void mine_ride_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1346,11 +1056,7 @@ static void mine_ride_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x008B09F0 */
 static void mine_ride_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1411,11 +1117,7 @@ static void mine_ride_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x008B0A00 */
 static void mine_ride_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_ride_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1423,11 +1125,7 @@ static void mine_ride_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x008B0A10 */
 static void mine_ride_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_ride_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1435,11 +1133,7 @@ static void mine_ride_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x008B0A20 */
 static void mine_ride_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_ride_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1447,11 +1141,7 @@ static void mine_ride_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x008B0A30 */
 static void mine_ride_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_ride_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1459,11 +1149,7 @@ static void mine_ride_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x008B0A40 */
 static void mine_ride_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1513,11 +1199,7 @@ static void mine_ride_track_left_bank(
 
 /** rct2: 0x008B0A50 */
 static void mine_ride_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_ride_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1525,11 +1207,7 @@ static void mine_ride_track_right_bank(
 
 /** rct2: 0x008B0A60 */
 static void mine_ride_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1598,8 +1276,7 @@ static void mine_ride_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -1630,8 +1307,7 @@ static void mine_ride_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -1680,11 +1356,7 @@ static void mine_ride_track_s_bend_left(
 
 /** rct2: 0x008B0A70 */
 static void mine_ride_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1753,8 +1425,7 @@ static void mine_ride_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -1785,8 +1456,7 @@ static void mine_ride_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -1835,11 +1505,7 @@ static void mine_ride_track_s_bend_right(
 
 /** rct2: 0x008B0AB0 */
 static void mine_ride_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1888,17 +1554,7 @@ static void mine_ride_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19396,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19396, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -1907,32 +1563,12 @@ static void mine_ride_track_left_quarter_turn_3(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19402,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19402, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19393,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19393, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -1986,11 +1622,7 @@ static void mine_ride_track_left_quarter_turn_3(
 
 /** rct2: 0x008B0AC0 */
 static void mine_ride_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -1999,11 +1631,7 @@ static void mine_ride_track_right_quarter_turn_3(
 
 /** rct2: 0x008B0AD0 */
 static void mine_ride_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2015,34 +1643,14 @@ static void mine_ride_track_left_quarter_turn_3_bank(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19409, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19416,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19416, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19412,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19412, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2076,62 +1684,22 @@ static void mine_ride_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19408,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19408, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19411,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19411, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19414,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19414, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19405,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19405, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -2150,17 +1718,7 @@ static void mine_ride_track_left_quarter_turn_3_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19410,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19410, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2169,17 +1727,7 @@ static void mine_ride_track_left_quarter_turn_3_bank(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19413, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19417,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19417, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2209,11 +1757,7 @@ static void mine_ride_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x008B0AE0 */
 static void mine_ride_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -2222,11 +1766,7 @@ static void mine_ride_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x008B0AF0 */
 static void mine_ride_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2238,34 +1778,14 @@ static void mine_ride_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19495, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19502,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19502, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19498,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19498, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2288,10 +1808,8 @@ static void mine_ride_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -2302,62 +1820,22 @@ static void mine_ride_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19494,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19494, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19497,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19497, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19500,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19500, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19491,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19491, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -2376,17 +1854,7 @@ static void mine_ride_track_left_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19496,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19496, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 12, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2395,17 +1863,7 @@ static void mine_ride_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19499, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19503,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19503, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2427,10 +1885,8 @@ static void mine_ride_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -2446,34 +1902,14 @@ static void mine_ride_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19495, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19502,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19502, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19498,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19498, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2495,10 +1931,8 @@ static void mine_ride_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -2509,62 +1943,22 @@ static void mine_ride_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19491,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19491, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19494,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19494, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19497,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19497, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19500,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19500, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -2589,17 +1983,7 @@ static void mine_ride_track_left_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19496,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19496, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 12, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2608,17 +1992,7 @@ static void mine_ride_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19499, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19503,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19503, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2629,10 +2003,8 @@ static void mine_ride_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -2640,11 +2012,7 @@ static void mine_ride_track_left_half_banked_helix_up_small(
 
 /** rct2: 0x008B0B00 */
 static void mine_ride_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2666,17 +2034,7 @@ static void mine_ride_track_right_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19482,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19482, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 9, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2685,17 +2043,7 @@ static void mine_ride_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19485, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19489,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19489, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 11, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2706,10 +2054,8 @@ static void mine_ride_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -2720,62 +2066,22 @@ static void mine_ride_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19477,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19477, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19480,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19480, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19483,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19483, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19486,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19486, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -2796,34 +2102,14 @@ static void mine_ride_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19481, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19488,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19488, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19484,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19484, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2845,10 +2131,8 @@ static void mine_ride_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -2862,17 +2146,7 @@ static void mine_ride_track_right_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19482,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19482, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 9, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2881,17 +2155,7 @@ static void mine_ride_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19485, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19489,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19489, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 11, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -2913,10 +2177,8 @@ static void mine_ride_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -2927,62 +2189,22 @@ static void mine_ride_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19480,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19480, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19483,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19483, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19486,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19486, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19477,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19477, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -2997,34 +2219,14 @@ static void mine_ride_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19481, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19488,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19488, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19484,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19484, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3047,10 +2249,8 @@ static void mine_ride_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -3058,11 +2258,7 @@ static void mine_ride_track_right_half_banked_helix_up_small(
 
 /** rct2: 0x008B0B10 */
 static void mine_ride_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -3077,11 +2273,7 @@ static void mine_ride_track_left_half_banked_helix_down_small(
 
 /** rct2: 0x008B0B20 */
 static void mine_ride_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -3096,11 +2288,7 @@ static void mine_ride_track_right_half_banked_helix_down_small(
 
 /** rct2: 0x008B0B30 */
 static void mine_ride_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3112,34 +2300,14 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19535, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19546,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19546, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19540,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19540, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3162,10 +2330,8 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -3180,47 +2346,17 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19539,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19539, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19544,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19544, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19529,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19529, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -3228,8 +2364,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -3237,47 +2372,17 @@ static void mine_ride_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19533,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19533, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19538,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19538, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19543,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19543, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -3297,32 +2402,12 @@ static void mine_ride_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19532,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19532, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19537,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19537, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -3331,17 +2416,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19527,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19527, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -3349,8 +2424,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -3364,17 +2438,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19536,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19536, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3383,17 +2447,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19541, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19547,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19547, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3415,10 +2469,8 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -3434,34 +2486,14 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19535, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19546,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19546, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19540,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19540, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3483,10 +2515,8 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -3497,17 +2527,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19529,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19529, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -3516,32 +2536,12 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19539,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19539, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19544,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19544, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -3549,8 +2549,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -3562,47 +2561,17 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19533,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19533, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19538,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19538, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19543,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19543, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -3618,47 +2587,17 @@ static void mine_ride_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19527,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19527, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19532,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19532, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19537,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19537, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -3670,8 +2609,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -3691,17 +2629,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19536,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19536, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3710,17 +2638,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19541, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19547,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19547, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3731,10 +2649,8 @@ static void mine_ride_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -3742,11 +2658,7 @@ static void mine_ride_track_left_half_banked_helix_up_large(
 
 /** rct2: 0x008B0B40 */
 static void mine_ride_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3768,17 +2680,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19514,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19514, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3787,17 +2689,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19519, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19525,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19525, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3808,10 +2700,8 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -3822,47 +2712,17 @@ static void mine_ride_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19505,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19505, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19510,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19510, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19515,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19515, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -3874,8 +2734,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -3887,47 +2746,17 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19511,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19511, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19516,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19516, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19521,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19521, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -3943,17 +2772,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19507,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19507, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -3962,32 +2781,12 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19517,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19517, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19522,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19522, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -3995,8 +2794,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -4012,34 +2810,14 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19513, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19524,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19524, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19518,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19518, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4061,10 +2839,8 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -4078,17 +2854,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19514,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19514, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4097,17 +2863,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19519, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19525,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19525, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4129,10 +2885,8 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -4143,32 +2897,12 @@ static void mine_ride_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19510,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19510, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19515,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19515, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -4177,17 +2911,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19505,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19505, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4195,8 +2919,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -4204,47 +2927,17 @@ static void mine_ride_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19511,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19511, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19516,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19516, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19521,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19521, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -4268,47 +2961,17 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19517,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19517, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19522,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19522, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19507,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19507, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -4316,8 +2979,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -4327,34 +2989,14 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19513, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19524,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19524, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19518,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19518, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4377,10 +3019,8 @@ static void mine_ride_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -4388,11 +3028,7 @@ static void mine_ride_track_right_half_banked_helix_up_large(
 
 /** rct2: 0x008B0B50 */
 static void mine_ride_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -4407,11 +3043,7 @@ static void mine_ride_track_left_half_banked_helix_down_large(
 
 /** rct2: 0x008B0B60 */
 static void mine_ride_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -4426,11 +3058,7 @@ static void mine_ride_track_right_half_banked_helix_down_large(
 
 /** rct2: 0x008B0B70 */
 static void mine_ride_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -4476,11 +3104,7 @@ static void mine_ride_track_on_ride_photo(
 
 /** rct2: 0x008B0B90 */
 static void mine_ride_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4534,32 +3158,12 @@ static void mine_ride_track_left_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19573,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19573, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19577,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19577, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -4567,8 +3171,7 @@ static void mine_ride_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -4576,47 +3179,17 @@ static void mine_ride_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19566,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19566, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19570,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19570, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19574,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19574, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -4625,10 +3198,8 @@ static void mine_ride_track_left_eighth_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -4641,34 +3212,14 @@ static void mine_ride_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19567,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19567, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 3, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19571,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19571, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4681,17 +3232,7 @@ static void mine_ride_track_left_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19579,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19579, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 2, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4701,8 +3242,7 @@ static void mine_ride_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -4710,11 +3250,7 @@ static void mine_ride_track_left_eighth_to_diag(
 
 /** rct2: 0x008B0BA0 */
 static void mine_ride_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4760,32 +3296,12 @@ static void mine_ride_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19549,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19549, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19553,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19553, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -4801,8 +3317,7 @@ static void mine_ride_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -4814,17 +3329,7 @@ static void mine_ride_track_right_eighth_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19554,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19554, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
@@ -4833,25 +3338,13 @@ static void mine_ride_track_right_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19562,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19562, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -4864,17 +3357,7 @@ static void mine_ride_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19551,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19551, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4887,34 +3370,14 @@ static void mine_ride_track_right_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19559,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19559, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 2, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19563,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19563, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 3, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4924,8 +3387,7 @@ static void mine_ride_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -4933,11 +3395,7 @@ static void mine_ride_track_right_eighth_to_diag(
 
 /** rct2: 0x008B0BB0 */
 static void mine_ride_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -4946,11 +3404,7 @@ static void mine_ride_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008B0BC0 */
 static void mine_ride_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -4959,11 +3413,7 @@ static void mine_ride_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008B0BD0 */
 static void mine_ride_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4973,34 +3423,14 @@ static void mine_ride_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19596,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19596, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19600,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19600, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5035,47 +3465,17 @@ static void mine_ride_track_left_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19601,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19601, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19605,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19605, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19609,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19609, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5083,8 +3483,7 @@ static void mine_ride_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -5092,47 +3491,17 @@ static void mine_ride_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19598,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19598, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19602,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19602, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19606,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19606, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -5141,10 +3510,8 @@ static void mine_ride_track_left_eighth_bank_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -5157,34 +3524,14 @@ static void mine_ride_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19599,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19599, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 3, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19603,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19603, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5197,17 +3544,7 @@ static void mine_ride_track_left_eighth_bank_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19611,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19611, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 2, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5217,8 +3554,7 @@ static void mine_ride_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -5226,11 +3562,7 @@ static void mine_ride_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x008B0BE0 */
 static void mine_ride_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5252,34 +3584,14 @@ static void mine_ride_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19588,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19588, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19592,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19592, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5298,47 +3610,17 @@ static void mine_ride_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19581,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19581, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19585,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19585, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19589,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19589, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -5350,8 +3632,7 @@ static void mine_ride_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -5363,55 +3644,23 @@ static void mine_ride_track_right_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19586,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19586, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19590,
-                        0,
-                        0,
-                        28,
-                        28,
-                        0,
-                        height,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19590, 0, 0, 28, 28, 0, height, 4, 4,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19594,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19594, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -5424,17 +3673,7 @@ static void mine_ride_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19583,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19583, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5447,34 +3686,14 @@ static void mine_ride_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19591,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19591, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 2, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19595,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19595, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 3, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5484,8 +3703,7 @@ static void mine_ride_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -5493,11 +3711,7 @@ static void mine_ride_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x008B0BF0 */
 static void mine_ride_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -5506,11 +3720,7 @@ static void mine_ride_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008B0C00 */
 static void mine_ride_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -5519,11 +3729,7 @@ static void mine_ride_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008B0B80 */
 static void mine_ride_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5533,17 +3739,7 @@ static void mine_ride_track_diag_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19615,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19615, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -5556,17 +3752,7 @@ static void mine_ride_track_diag_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19612,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19612, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -5579,17 +3765,7 @@ static void mine_ride_track_diag_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19614,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19614, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -5606,17 +3782,7 @@ static void mine_ride_track_diag_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19613,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19613, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5639,11 +3805,7 @@ static void mine_ride_track_diag_flat(
 
 /** rct2: 0x008B0C30 */
 static void mine_ride_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5653,17 +3815,7 @@ static void mine_ride_track_diag_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19627,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19627, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -5676,17 +3828,7 @@ static void mine_ride_track_diag_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19624,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19624, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -5699,17 +3841,7 @@ static void mine_ride_track_diag_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19626,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19626, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -5726,17 +3858,7 @@ static void mine_ride_track_diag_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19625,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19625, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5759,11 +3881,7 @@ static void mine_ride_track_diag_25_deg_up(
 
 /** rct2: 0x008B0C10 */
 static void mine_ride_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5773,17 +3891,7 @@ static void mine_ride_track_diag_flat_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19619,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19619, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -5796,17 +3904,7 @@ static void mine_ride_track_diag_flat_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19616,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19616, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -5819,17 +3917,7 @@ static void mine_ride_track_diag_flat_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19618,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19618, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -5846,17 +3934,7 @@ static void mine_ride_track_diag_flat_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19617,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19617, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5879,11 +3957,7 @@ static void mine_ride_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008B0C20 */
 static void mine_ride_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5893,17 +3967,7 @@ static void mine_ride_track_diag_25_deg_up_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19623,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19623, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -5916,17 +3980,7 @@ static void mine_ride_track_diag_25_deg_up_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19620,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19620, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -5939,17 +3993,7 @@ static void mine_ride_track_diag_25_deg_up_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19622,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19622, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -5966,17 +4010,7 @@ static void mine_ride_track_diag_25_deg_up_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19621,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19621, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5999,11 +4033,7 @@ static void mine_ride_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008B0C60 */
 static void mine_ride_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6013,17 +4043,7 @@ static void mine_ride_track_diag_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19625,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19625, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6036,17 +4056,7 @@ static void mine_ride_track_diag_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19626,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19626, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6059,17 +4069,7 @@ static void mine_ride_track_diag_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19624,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19624, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6086,17 +4086,7 @@ static void mine_ride_track_diag_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19627,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19627, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6119,11 +4109,7 @@ static void mine_ride_track_diag_25_deg_down(
 
 /** rct2: 0x008B0C40 */
 static void mine_ride_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6133,17 +4119,7 @@ static void mine_ride_track_diag_flat_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19621,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19621, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6155,17 +4131,7 @@ static void mine_ride_track_diag_flat_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19622,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19622, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6177,17 +4143,7 @@ static void mine_ride_track_diag_flat_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19620,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19620, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6203,17 +4159,7 @@ static void mine_ride_track_diag_flat_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19623,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19623, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6237,11 +4183,7 @@ static void mine_ride_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008B0C50 */
 static void mine_ride_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6251,17 +4193,7 @@ static void mine_ride_track_diag_25_deg_down_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19617,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19617, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6274,17 +4206,7 @@ static void mine_ride_track_diag_25_deg_down_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19618,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19618, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6297,17 +4219,7 @@ static void mine_ride_track_diag_25_deg_down_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19616,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19616, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6324,17 +4236,7 @@ static void mine_ride_track_diag_25_deg_down_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19619,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19619, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6357,11 +4259,7 @@ static void mine_ride_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x008B0C90 */
 static void mine_ride_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6371,17 +4269,7 @@ static void mine_ride_track_diag_flat_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19635,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19635, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6394,30 +4282,10 @@ static void mine_ride_track_diag_flat_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19632,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19632, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19636,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19636, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -6430,17 +4298,7 @@ static void mine_ride_track_diag_flat_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19634,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19634, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6457,17 +4315,7 @@ static void mine_ride_track_diag_flat_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19633,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19633, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6490,11 +4338,7 @@ static void mine_ride_track_diag_flat_to_left_bank(
 
 /** rct2: 0x008B0CA0 */
 static void mine_ride_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6504,17 +4348,7 @@ static void mine_ride_track_diag_flat_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19640,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19640, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6527,17 +4361,7 @@ static void mine_ride_track_diag_flat_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19637,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19637, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6550,30 +4374,10 @@ static void mine_ride_track_diag_flat_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19639,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19639, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19641,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19641, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -6590,17 +4394,7 @@ static void mine_ride_track_diag_flat_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19638,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19638, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6623,11 +4417,7 @@ static void mine_ride_track_diag_flat_to_right_bank(
 
 /** rct2: 0x008B0CB0 */
 static void mine_ride_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6637,17 +4427,7 @@ static void mine_ride_track_diag_left_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19638,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19638, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6660,30 +4440,10 @@ static void mine_ride_track_diag_left_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19639,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19639, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19641,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19641, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -6696,17 +4456,7 @@ static void mine_ride_track_diag_left_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19637,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19637, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6723,17 +4473,7 @@ static void mine_ride_track_diag_left_bank_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19640,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19640, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6756,11 +4496,7 @@ static void mine_ride_track_diag_left_bank_to_flat(
 
 /** rct2: 0x008B0CC0 */
 static void mine_ride_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6770,17 +4506,7 @@ static void mine_ride_track_diag_right_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19633,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19633, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6793,17 +4519,7 @@ static void mine_ride_track_diag_right_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19634,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19634, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6816,30 +4532,10 @@ static void mine_ride_track_diag_right_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19632,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19632, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19636,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19636, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -6856,17 +4552,7 @@ static void mine_ride_track_diag_right_bank_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19635,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19635, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6889,11 +4575,7 @@ static void mine_ride_track_diag_right_bank_to_flat(
 
 /** rct2: 0x008B0CF0 */
 static void mine_ride_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6903,17 +4585,7 @@ static void mine_ride_track_diag_left_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19655,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19655, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6926,30 +4598,10 @@ static void mine_ride_track_diag_left_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19652,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19652, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19656,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19656, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -6962,17 +4614,7 @@ static void mine_ride_track_diag_left_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19654,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19654, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -6989,17 +4631,7 @@ static void mine_ride_track_diag_left_bank_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19653,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19653, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7022,11 +4654,7 @@ static void mine_ride_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x008B0D00 */
 static void mine_ride_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7036,17 +4664,7 @@ static void mine_ride_track_diag_right_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19660,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19660, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7059,17 +4677,7 @@ static void mine_ride_track_diag_right_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19657,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19657, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7082,30 +4690,10 @@ static void mine_ride_track_diag_right_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19659,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19659, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19661,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19661, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -7122,17 +4710,7 @@ static void mine_ride_track_diag_right_bank_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19658,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19658, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7155,11 +4733,7 @@ static void mine_ride_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x008B0CD0 */
 static void mine_ride_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7169,17 +4743,7 @@ static void mine_ride_track_diag_25_deg_up_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19645,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19645, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7192,30 +4756,10 @@ static void mine_ride_track_diag_25_deg_up_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19642,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19642, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19646,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19646, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -7228,17 +4772,7 @@ static void mine_ride_track_diag_25_deg_up_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19644,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19644, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7255,17 +4789,7 @@ static void mine_ride_track_diag_25_deg_up_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19643,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19643, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7288,11 +4812,7 @@ static void mine_ride_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x008B0CE0 */
 static void mine_ride_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7302,17 +4822,7 @@ static void mine_ride_track_diag_25_deg_up_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19650,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19650, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7325,17 +4835,7 @@ static void mine_ride_track_diag_25_deg_up_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19647,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19647, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7348,30 +4848,10 @@ static void mine_ride_track_diag_25_deg_up_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19649,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19649, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19651,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19651, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -7388,17 +4868,7 @@ static void mine_ride_track_diag_25_deg_up_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19648,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19648, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7421,11 +4891,7 @@ static void mine_ride_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x008B0D10 */
 static void mine_ride_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7435,17 +4901,7 @@ static void mine_ride_track_diag_left_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19648,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19648, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7457,30 +4913,10 @@ static void mine_ride_track_diag_left_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19649,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19649, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19651,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19651, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -7492,17 +4928,7 @@ static void mine_ride_track_diag_left_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19647,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19647, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7518,17 +4944,7 @@ static void mine_ride_track_diag_left_bank_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19650,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19650, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7552,11 +4968,7 @@ static void mine_ride_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x008B0D20 */
 static void mine_ride_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7566,17 +4978,7 @@ static void mine_ride_track_diag_right_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19643,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19643, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7588,17 +4990,7 @@ static void mine_ride_track_diag_right_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19644,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19644, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7610,30 +5002,10 @@ static void mine_ride_track_diag_right_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19642,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19642, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19646,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19646, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -7649,17 +5021,7 @@ static void mine_ride_track_diag_right_bank_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19645,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19645, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7683,11 +5045,7 @@ static void mine_ride_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x008B0D30 */
 static void mine_ride_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7697,17 +5055,7 @@ static void mine_ride_track_diag_25_deg_down_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19658,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19658, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7720,30 +5068,10 @@ static void mine_ride_track_diag_25_deg_down_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19659,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19659, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19661,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19661, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -7756,17 +5084,7 @@ static void mine_ride_track_diag_25_deg_down_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19657,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19657, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7783,17 +5101,7 @@ static void mine_ride_track_diag_25_deg_down_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19660,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19660, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7816,11 +5124,7 @@ static void mine_ride_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x008B0D40 */
 static void mine_ride_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7830,17 +5134,7 @@ static void mine_ride_track_diag_25_deg_down_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19653,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19653, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7853,17 +5147,7 @@ static void mine_ride_track_diag_25_deg_down_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19654,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19654, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7876,30 +5160,10 @@ static void mine_ride_track_diag_25_deg_down_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19652,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19652, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19656,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19656, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -7916,17 +5180,7 @@ static void mine_ride_track_diag_25_deg_down_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19655,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19655, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7949,11 +5203,7 @@ static void mine_ride_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x008B0C70 */
 static void mine_ride_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7963,17 +5213,7 @@ static void mine_ride_track_diag_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19631,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19631, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7986,17 +5226,7 @@ static void mine_ride_track_diag_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19628,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19628, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -8009,17 +5239,7 @@ static void mine_ride_track_diag_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19630,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19630, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8036,17 +5256,7 @@ static void mine_ride_track_diag_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19629,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19629, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8069,11 +5279,7 @@ static void mine_ride_track_diag_left_bank(
 
 /** rct2: 0x008B0C80 */
 static void mine_ride_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8083,17 +5289,7 @@ static void mine_ride_track_diag_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19629,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19629, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8106,17 +5302,7 @@ static void mine_ride_track_diag_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19630,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19630, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8129,17 +5315,7 @@ static void mine_ride_track_diag_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19628,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19628, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -8156,17 +5332,7 @@ static void mine_ride_track_diag_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19631,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19631, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
diff --git a/src/openrct2/ride/coaster/MineTrainCoaster.cpp b/src/openrct2/ride/coaster/MineTrainCoaster.cpp
index dc5840c5ec..2eee2933e5 100644
--- a/src/openrct2/ride/coaster/MineTrainCoaster.cpp
+++ b/src/openrct2/ride/coaster/MineTrainCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x0071BFA4 */
 static void mine_train_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -79,11 +75,7 @@ static void mine_train_rc_track_flat(
 
 /** rct2: 0x0071C154, 0x0071C164, 0x0071C174 */
 static void mine_train_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -94,48 +86,18 @@ static void mine_train_rc_track_station(
     };
 
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][2] | session->TrackColours[SCHEME_MISC],
-        0,
-        0,
-        32,
-        28,
-        1,
-        height - 2,
-        0,
-        2,
+        session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height - 2, 0, 2,
         height);
     if (track_element_get_type(tileElement) == TRACK_ELEM_END_STATION)
     {
         sub_98199C_rotated(
-            session,
-            direction,
-            imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            1,
-            height,
-            0,
-            0,
+            session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 0,
             height);
     }
     else
     {
         sub_98199C_rotated(
-            session,
-            direction,
-            imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            1,
-            height,
-            0,
-            0,
+            session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 0,
             height);
     }
     track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 3);
@@ -147,11 +109,7 @@ static void mine_train_rc_track_station(
 
 /** rct2: 0x0071BFB4 */
 static void mine_train_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -220,11 +178,7 @@ static void mine_train_rc_track_25_deg_up(
 
 /** rct2: 0x0071BFC4 */
 static void mine_train_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -264,11 +218,7 @@ static void mine_train_rc_track_60_deg_up(
 
 /** rct2: 0x0071BFD4 */
 static void mine_train_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -337,11 +287,7 @@ static void mine_train_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x0071BFE4 */
 static void mine_train_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -385,11 +331,7 @@ static void mine_train_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x0071BFF4 */
 static void mine_train_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -433,11 +375,7 @@ static void mine_train_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x0071C004 */
 static void mine_train_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -506,11 +444,7 @@ static void mine_train_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x0071C014 */
 static void mine_train_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_train_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -518,11 +452,7 @@ static void mine_train_rc_track_25_deg_down(
 
 /** rct2: 0x0071C024 */
 static void mine_train_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_train_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -530,11 +460,7 @@ static void mine_train_rc_track_60_deg_down(
 
 /** rct2: 0x0071C034 */
 static void mine_train_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_train_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -542,11 +468,7 @@ static void mine_train_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x0071C044 */
 static void mine_train_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_train_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -554,11 +476,7 @@ static void mine_train_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x0071C054 */
 static void mine_train_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_train_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -566,11 +484,7 @@ static void mine_train_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x0071C064 */
 static void mine_train_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_train_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -578,11 +492,7 @@ static void mine_train_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x0071C0B4 */
 static void mine_train_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -638,33 +548,13 @@ static void mine_train_rc_track_left_quarter_turn_5(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20164,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20164, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20149,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20149, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -673,8 +563,7 @@ static void mine_train_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -682,49 +571,19 @@ static void mine_train_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20153,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20153, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20158,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20158, 0, 0, 16, 16, 1, height, 16, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20163,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20163, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -739,8 +598,7 @@ static void mine_train_rc_track_left_quarter_turn_5(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -753,17 +611,7 @@ static void mine_train_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20152,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20152, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -779,17 +627,7 @@ static void mine_train_rc_track_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20147,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20147, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -798,8 +636,7 @@ static void mine_train_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -843,11 +680,7 @@ static void mine_train_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x0071C0C4 */
 static void mine_train_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -856,11 +689,7 @@ static void mine_train_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x0071C074 */
 static void mine_train_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -897,11 +726,7 @@ static void mine_train_rc_track_flat_to_left_bank(
 
 /** rct2: 0x0071C084 */
 static void mine_train_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -938,11 +763,7 @@ static void mine_train_rc_track_flat_to_right_bank(
 
 /** rct2: 0x0071C094 */
 static void mine_train_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -979,11 +800,7 @@ static void mine_train_rc_track_left_bank_to_flat(
 
 /** rct2: 0x0071C0A4 */
 static void mine_train_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1020,11 +837,7 @@ static void mine_train_rc_track_right_bank_to_flat(
 
 /** rct2: 0x0071C0D4 */
 static void mine_train_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1036,33 +849,13 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20175, 0, 0, 32, 20, 1, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20186,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20186, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20180,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20180, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1099,49 +892,19 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20179,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20179, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20184,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20184, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20169,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20169, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1150,8 +913,7 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -1159,49 +921,19 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20173,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20173, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20178,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20178, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20183,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20183, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1216,8 +948,7 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -1230,33 +961,13 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20172,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20172, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20177,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20177, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1267,17 +978,7 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20167,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20167, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1286,8 +987,7 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -1300,17 +1000,7 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20176,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20176, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1318,17 +1008,7 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20181, 0, 0, 20, 32, 1, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20187,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20187, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1355,11 +1035,7 @@ static void mine_train_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x0071C0E4 */
 static void mine_train_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1368,11 +1044,7 @@ static void mine_train_rc_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x0071C204 */
 static void mine_train_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1416,11 +1088,7 @@ static void mine_train_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x0071C214 */
 static void mine_train_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1464,11 +1132,7 @@ static void mine_train_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x0071C224 */
 static void mine_train_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1512,11 +1176,7 @@ static void mine_train_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x0071C234 */
 static void mine_train_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1560,11 +1220,7 @@ static void mine_train_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x0071C244 */
 static void mine_train_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_train_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1572,11 +1228,7 @@ static void mine_train_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x0071C254 */
 static void mine_train_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_train_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1584,11 +1236,7 @@ static void mine_train_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x0071C264 */
 static void mine_train_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_train_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1596,11 +1244,7 @@ static void mine_train_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x0071C274 */
 static void mine_train_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_train_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1608,11 +1252,7 @@ static void mine_train_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x0071C304 */
 static void mine_train_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1645,11 +1285,7 @@ static void mine_train_rc_track_left_bank(
 
 /** rct2: 0x0071C314 */
 static void mine_train_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mine_train_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1657,11 +1293,7 @@ static void mine_train_rc_track_right_bank(
 
 /** rct2: 0x0071C0F4 */
 static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1717,33 +1349,13 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20261,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20261, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20266,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20266, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1752,8 +1364,7 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -1761,49 +1372,19 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20252,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20252, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20257,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20257, 0, 0, 16, 16, 1, height, 16, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20262,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20262, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1818,8 +1399,7 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 4:
@@ -1832,17 +1412,7 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20253,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20253, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1858,17 +1428,7 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20268,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20268, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1877,8 +1437,7 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -1922,11 +1481,7 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x0071C104 */
 static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1972,33 +1527,13 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20231,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20231, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20236,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20236, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2017,8 +1552,7 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -2031,49 +1565,19 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20237,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20237, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20242,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20242, 0, 0, 16, 16, 1, height, 16, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20247,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20247, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2083,8 +1587,7 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 4:
@@ -2097,17 +1600,7 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20233,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20233, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2123,17 +1616,7 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20248,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20248, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2142,8 +1625,7 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -2187,11 +1669,7 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x0071C114 */
 static void mine_train_rc_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2201,11 +1679,7 @@ static void mine_train_rc_track_left_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x0071C124 */
 static void mine_train_rc_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2215,11 +1689,7 @@ static void mine_train_rc_track_right_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x0071C134 */
 static void mine_train_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2283,8 +1753,7 @@ static void mine_train_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2315,8 +1784,7 @@ static void mine_train_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2360,11 +1828,7 @@ static void mine_train_rc_track_s_bend_left(
 
 /** rct2: 0x0071C144 */
 static void mine_train_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2428,8 +1892,7 @@ static void mine_train_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2460,8 +1923,7 @@ static void mine_train_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2505,11 +1967,7 @@ static void mine_train_rc_track_s_bend_right(
 
 /** rct2: 0x0071C184 */
 static void mine_train_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2568,17 +2026,7 @@ static void mine_train_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20192,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20192, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -2587,32 +2035,12 @@ static void mine_train_rc_track_left_quarter_turn_3(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20198,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20198, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20189,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20189, 0, 0, 16, 16, 1, height, 16, 16,
                         height);
                     break;
             }
@@ -2661,11 +2089,7 @@ static void mine_train_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x0071C194 */
 static void mine_train_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -2674,11 +2098,7 @@ static void mine_train_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x0071C1A4 */
 static void mine_train_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2690,33 +2110,13 @@ static void mine_train_rc_track_left_quarter_turn_3_bank(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20205, 0, 0, 32, 20, 1, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20212,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20212, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20208,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20208, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2761,62 +2161,22 @@ static void mine_train_rc_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20204,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20204, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20207,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20207, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20210,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20210, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20201,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20201, 0, 0, 16, 16, 1, height, 16, 16,
                         height);
                     break;
             }
@@ -2834,17 +2194,7 @@ static void mine_train_rc_track_left_quarter_turn_3_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20206,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20206, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2852,17 +2202,7 @@ static void mine_train_rc_track_left_quarter_turn_3_bank(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20209, 0, 0, 20, 32, 1, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20213,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20213, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2889,11 +2229,7 @@ static void mine_train_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x0071C1B4 */
 static void mine_train_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -2902,11 +2238,7 @@ static void mine_train_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x0071C1C4 */
 static void mine_train_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3006,11 +2338,7 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x0071C1D4 */
 static void mine_train_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3110,11 +2438,7 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x0071C1E4 */
 static void mine_train_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3124,11 +2448,7 @@ static void mine_train_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x0071C1F4 */
 static void mine_train_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3138,11 +2458,7 @@ static void mine_train_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x0071C284 */
 static void mine_train_rc_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3154,33 +2470,13 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20305, 0, 0, 32, 20, 1, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20312,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20312, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20308,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20308, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3202,10 +2498,8 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -3231,62 +2525,22 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20304,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20304, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20307,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20307, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20310,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20310, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20301,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20301, 0, 0, 16, 16, 1, height, 16, 16,
                         height);
                     break;
             }
@@ -3304,17 +2558,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20306,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20306, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3322,17 +2566,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20309, 0, 0, 20, 32, 1, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20313,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20313, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3354,10 +2588,8 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -3372,33 +2604,13 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20305, 0, 0, 20, 32, 1, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20312,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20312, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20308,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20308, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3420,10 +2632,8 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -3449,62 +2659,22 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20301,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20301, 0, 0, 16, 16, 1, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20304,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20304, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20307,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20307, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20310,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20310, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     break;
             }
@@ -3527,17 +2697,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20306,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20306, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3545,17 +2705,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20309, 0, 0, 32, 20, 1, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20313,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20313, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3567,10 +2717,8 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -3578,11 +2726,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_small(
 
 /** rct2: 0x0071C294 */
 static void mine_train_rc_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3602,17 +2746,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20292,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20292, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3620,17 +2754,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20295, 0, 0, 32, 20, 1, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20299,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20299, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3642,10 +2766,8 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -3671,62 +2793,22 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20287,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20287, 0, 0, 16, 16, 1, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20290,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20290, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20293,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20293, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20296,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20296, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     break;
             }
@@ -3746,33 +2828,13 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20291, 0, 0, 20, 32, 1, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20298,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20298, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20294,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20294, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3794,10 +2856,8 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -3810,17 +2870,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20292,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20292, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3828,17 +2878,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20295, 0, 0, 20, 32, 1, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20299,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20299, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3860,10 +2900,8 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -3889,62 +2927,22 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20290,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20290, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20293,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20293, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20296,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20296, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20287,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20287, 0, 0, 16, 16, 1, height, 16, 16,
                         height);
                     break;
             }
@@ -3959,33 +2957,13 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20291, 0, 0, 32, 20, 1, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20298,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20298, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20294,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20294, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4007,10 +2985,8 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -4018,11 +2994,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_small(
 
 /** rct2: 0x0071C2A4 */
 static void mine_train_rc_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -4037,11 +3009,7 @@ static void mine_train_rc_track_left_half_banked_helix_down_small(
 
 /** rct2: 0x0071C2B4 */
 static void mine_train_rc_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -4056,11 +3024,7 @@ static void mine_train_rc_track_right_half_banked_helix_down_small(
 
 /** rct2: 0x0071C2C4 */
 static void mine_train_rc_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4072,33 +3036,13 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20345, 0, 0, 32, 20, 1, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20356,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20356, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20350,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20350, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4120,10 +3064,8 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -4141,49 +3083,19 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20349,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20349, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20354,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20354, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20339,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20339, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4192,8 +3104,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -4201,62 +3112,22 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20343,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20343, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20348,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20348, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20178,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20178, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20353,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20353, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4282,46 +3153,16 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20342,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20342, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20347,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20347, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20177,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20177, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4332,17 +3173,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20337,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20337, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4351,8 +3182,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -4365,17 +3195,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20346,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20346, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4383,17 +3203,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20351, 0, 0, 20, 32, 1, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20357,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20357, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4415,10 +3225,8 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -4433,33 +3241,13 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20345, 0, 0, 20, 32, 1, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20356,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20356, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20350,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20350, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4481,10 +3269,8 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -4497,17 +3283,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20339,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20339, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4518,33 +3294,13 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20349,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20349, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20354,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20354, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4553,8 +3309,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -4567,62 +3322,22 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20343,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20343, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20348,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20348, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20178,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20178, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20353,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20353, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4643,62 +3358,22 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20337,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20337, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20342,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20342, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20347,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20347, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20177,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20177, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4712,8 +3387,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -4731,17 +3405,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20346,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20346, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4749,17 +3413,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20351, 0, 0, 32, 20, 1, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20357,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20357, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4771,10 +3425,8 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -4782,11 +3434,7 @@ static void mine_train_rc_track_left_half_banked_helix_up_large(
 
 /** rct2: 0x0071C2D4 */
 static void mine_train_rc_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4806,17 +3454,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20324,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20324, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4824,17 +3462,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20329, 0, 0, 32, 20, 1, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20335,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20335, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4846,10 +3474,8 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -4862,49 +3488,19 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20315,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20315, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20320,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20320, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20325,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20325, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4918,8 +3514,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -4932,49 +3527,19 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20321,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20321, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20326,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20326, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20331,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20331, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4995,17 +3560,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20317,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20317, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5016,33 +3571,13 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20327,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20327, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20332,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20332, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5051,8 +3586,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -5067,33 +3601,13 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20323, 0, 0, 20, 32, 1, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20334,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20334, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20328,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20328, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5115,10 +3629,8 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -5131,17 +3643,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20324,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20324, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5149,17 +3651,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20329, 0, 0, 20, 32, 1, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20335,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20335, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5181,10 +3673,8 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -5197,33 +3687,13 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20320,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20320, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20325,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20325, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5234,17 +3704,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20315,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20315, 0, 0, 16, 32, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5253,8 +3713,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -5262,49 +3721,19 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20321,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20321, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20326,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20326, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20331,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20331, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5335,49 +3764,19 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20327,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20327, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20332,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20332, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20317,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20317, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5386,8 +3785,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -5397,33 +3795,13 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 20323, 0, 0, 32, 20, 1, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20334,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20334, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20328,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20328, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5445,10 +3823,8 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -5456,11 +3832,7 @@ static void mine_train_rc_track_right_half_banked_helix_up_large(
 
 /** rct2: 0x0071C2E4 */
 static void mine_train_rc_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -5475,11 +3847,7 @@ static void mine_train_rc_track_left_half_banked_helix_down_large(
 
 /** rct2: 0x0071C2F4 */
 static void mine_train_rc_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -5494,11 +3862,7 @@ static void mine_train_rc_track_right_half_banked_helix_down_large(
 
 /** rct2: 0x0071C324 */
 static void mine_train_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -5523,11 +3887,7 @@ static void mine_train_rc_track_brakes(
 
 /** rct2: 0x0071C334 */
 static void mine_train_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -5561,11 +3921,7 @@ static void mine_train_rc_track_on_ride_photo(
 
 /** rct2: 0x0071C354 */
 static void mine_train_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5616,33 +3972,13 @@ static void mine_train_rc_track_left_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20461,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20461, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20465,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20465, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5655,49 +3991,19 @@ static void mine_train_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20454,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20454, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20458,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20458, 0, 0, 16, 16, 1, height, 16, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20462,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20462, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5734,32 +4040,12 @@ static void mine_train_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20455,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20455, 0, 0, 16, 16, 1, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20459,
-                        0,
-                        0,
-                        16,
-                        18,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20459, 0, 0, 16, 18, 1, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -5768,17 +4054,7 @@ static void mine_train_rc_track_left_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20467,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20467, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     break;
             }
@@ -5790,11 +4066,7 @@ static void mine_train_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x0071C364 */
 static void mine_train_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5835,33 +4107,13 @@ static void mine_train_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20437,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20437, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20441,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20441, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5889,17 +4141,7 @@ static void mine_train_rc_track_right_eighth_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20442,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20442, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5910,17 +4152,7 @@ static void mine_train_rc_track_right_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20450,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20450, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5952,17 +4184,7 @@ static void mine_train_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20439,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20439, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -5971,32 +4193,12 @@ static void mine_train_rc_track_right_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20447,
-                        0,
-                        0,
-                        16,
-                        18,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20447, 0, 0, 16, 18, 1, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20451,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20451, 0, 0, 16, 16, 1, height, 16, 16,
                         height);
                     break;
             }
@@ -6008,11 +4210,7 @@ static void mine_train_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x0071C374 */
 static void mine_train_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -6021,11 +4219,7 @@ static void mine_train_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x0071C384 */
 static void mine_train_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -6034,11 +4228,7 @@ static void mine_train_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x0071C394 */
 static void mine_train_rc_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6048,33 +4238,13 @@ static void mine_train_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20484,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20484, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20488,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20488, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6106,49 +4276,19 @@ static void mine_train_rc_track_left_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20489,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20489, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20493,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20493, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20497,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20497, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6161,49 +4301,19 @@ static void mine_train_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20486,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20486, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20490,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20490, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20494,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20494, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6240,32 +4350,12 @@ static void mine_train_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20487,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20487, 0, 0, 16, 16, 1, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20491,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20491, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 2:
@@ -6274,17 +4364,7 @@ static void mine_train_rc_track_left_eighth_bank_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20499,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20499, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     break;
             }
@@ -6296,11 +4376,7 @@ static void mine_train_rc_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x0071C3A4 */
 static void mine_train_rc_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6320,33 +4396,13 @@ static void mine_train_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20476,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20476, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20480,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20480, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6363,49 +4419,19 @@ static void mine_train_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20469,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20469, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20473,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20473, 0, 0, 32, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20477,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20477, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 6, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6428,49 +4454,19 @@ static void mine_train_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20474,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20474, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 9, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20478,
-                        0,
-                        0,
-                        28,
-                        28,
-                        0,
-                        height,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20478, 0, 0, 28, 28, 0, height, 4, 4,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 10, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20482,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20482, 0, 0, 16, 16, 1, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 11, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6502,17 +4498,7 @@ static void mine_train_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20471,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20471, 0, 0, 16, 16, 1, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -6521,32 +4507,12 @@ static void mine_train_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20479,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20479, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20483,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20483, 0, 0, 16, 16, 1, height, 16, 16,
                         height);
                     break;
             }
@@ -6558,11 +4524,7 @@ static void mine_train_rc_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x0071C3B4 */
 static void mine_train_rc_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -6571,11 +4533,7 @@ static void mine_train_rc_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x0071C3C4 */
 static void mine_train_rc_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -6584,11 +4542,7 @@ static void mine_train_rc_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x0071C344 */
 static void mine_train_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6600,18 +4554,8 @@ static void mine_train_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20389,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20389, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -6621,18 +4565,8 @@ static void mine_train_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20361,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20361, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -6646,18 +4580,8 @@ static void mine_train_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20386,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20386, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -6677,18 +4601,8 @@ static void mine_train_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20358,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20358, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -6718,18 +4632,8 @@ static void mine_train_rc_track_diag_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20388,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20388, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -6749,18 +4653,8 @@ static void mine_train_rc_track_diag_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20360,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20360, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -6778,18 +4672,8 @@ static void mine_train_rc_track_diag_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20387,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20387, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -6799,18 +4683,8 @@ static void mine_train_rc_track_diag_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20359,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20359, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -6822,11 +4696,7 @@ static void mine_train_rc_track_diag_flat(
 
 /** rct2: 0x0071C414 */
 static void mine_train_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6838,18 +4708,8 @@ static void mine_train_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20401,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20401, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -6859,18 +4719,8 @@ static void mine_train_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20373,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20373, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -6884,18 +4734,8 @@ static void mine_train_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20398,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20398, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -6919,18 +4759,8 @@ static void mine_train_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20370,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20370, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -6966,18 +4796,8 @@ static void mine_train_rc_track_diag_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20400,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20400, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -7001,18 +4821,8 @@ static void mine_train_rc_track_diag_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20372,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20372, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -7032,18 +4842,8 @@ static void mine_train_rc_track_diag_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20399,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20399, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7053,18 +4853,8 @@ static void mine_train_rc_track_diag_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20371,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20371, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7076,11 +4866,7 @@ static void mine_train_rc_track_diag_25_deg_up(
 
 /** rct2: 0x0071C474 */
 static void mine_train_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7090,17 +4876,7 @@ static void mine_train_rc_track_diag_60_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20385,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20385, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -7112,17 +4888,7 @@ static void mine_train_rc_track_diag_60_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20382,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20382, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7150,17 +4916,7 @@ static void mine_train_rc_track_diag_60_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20384,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20384, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7176,17 +4932,7 @@ static void mine_train_rc_track_diag_60_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20383,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20383, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -7198,11 +4944,7 @@ static void mine_train_rc_track_diag_60_deg_up(
 
 /** rct2: 0x0071C3F4 */
 static void mine_train_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7214,18 +4956,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20393,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20393, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7235,18 +4967,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20365,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20365, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7260,18 +4982,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20390,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20390, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -7291,18 +5003,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20362,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20362, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -7332,18 +5034,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20392,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20392, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -7363,18 +5055,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20364,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20364, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -7392,18 +5074,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20391,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20391, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7413,18 +5085,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20363,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20363, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7436,11 +5098,7 @@ static void mine_train_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x0071C454 */
 static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7450,17 +5108,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20377,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20377, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -7472,17 +5120,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20374,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20374, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7510,17 +5148,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20376,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20376, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7536,17 +5164,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20375,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20375, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -7558,11 +5176,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x0071C464 */
 static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7572,17 +5186,7 @@ static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20381,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20381, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -7594,17 +5198,7 @@ static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20378,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20378, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7632,17 +5226,7 @@ static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20380,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20380, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7658,17 +5242,7 @@ static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20379,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20379, -16, -16, 16, 16, 1, height, 0, 0,
                         height);
                     break;
             }
@@ -7680,11 +5254,7 @@ static void mine_train_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x0071C404 */
 static void mine_train_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7696,18 +5266,8 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20397,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20397, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7717,18 +5277,8 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20369,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20369, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7742,18 +5292,8 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20394,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20394, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -7777,18 +5317,8 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20366,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20366, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -7824,18 +5354,8 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20396,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20396, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -7859,18 +5379,8 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20368,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20368, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -7890,18 +5400,8 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20395,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20395, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7911,18 +5411,8 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20367,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20367, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7934,11 +5424,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x0071C444 */
 static void mine_train_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7950,18 +5436,8 @@ static void mine_train_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20399,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20399, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7971,18 +5447,8 @@ static void mine_train_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20371,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20371, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7996,18 +5462,8 @@ static void mine_train_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20400,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20400, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -8031,18 +5487,8 @@ static void mine_train_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20372,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20372, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -8078,18 +5524,8 @@ static void mine_train_rc_track_diag_25_deg_down(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20398,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20398, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -8113,18 +5549,8 @@ static void mine_train_rc_track_diag_25_deg_down(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20370,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20370, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -8144,18 +5570,8 @@ static void mine_train_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20401,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20401, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8165,18 +5581,8 @@ static void mine_train_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20373,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20373, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8188,11 +5594,7 @@ static void mine_train_rc_track_diag_25_deg_down(
 
 /** rct2: 0x0071C4A4 */
 static void mine_train_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8202,17 +5604,7 @@ static void mine_train_rc_track_diag_60_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20383,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20383, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -8224,17 +5616,7 @@ static void mine_train_rc_track_diag_60_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20384,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20384, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8262,17 +5644,7 @@ static void mine_train_rc_track_diag_60_deg_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20382,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20382, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8288,17 +5660,7 @@ static void mine_train_rc_track_diag_60_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20385,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20385, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -8310,11 +5672,7 @@ static void mine_train_rc_track_diag_60_deg_down(
 
 /** rct2: 0x0071C424 */
 static void mine_train_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8326,18 +5684,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20395,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20395, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8347,18 +5695,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20367,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20367, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8371,18 +5709,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20396,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20396, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -8406,18 +5734,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20368,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20368, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -8452,18 +5770,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20394,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20394, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -8487,18 +5795,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20366,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20366, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_b_supports_paint_setup(
                             session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -8517,18 +5815,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20397,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20397, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8538,18 +5826,8 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20369,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20369, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8562,11 +5840,7 @@ static void mine_train_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x0071C484 */
 static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8576,17 +5850,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20379,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20379, -16, -16, 16, 16, 1, height, 0, 0,
                         height);
                     break;
             }
@@ -8598,17 +5862,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20380,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20380, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8636,17 +5890,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20378,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20378, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8662,17 +5906,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20381,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20381, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -8684,11 +5918,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x0071C494 */
 static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8698,17 +5928,7 @@ static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20375,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20375, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -8720,17 +5940,7 @@ static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20376,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20376, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8758,17 +5968,7 @@ static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20374,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20374, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8784,17 +5984,7 @@ static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20377,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20377, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -8806,11 +5996,7 @@ static void mine_train_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x0071C434 */
 static void mine_train_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8822,18 +6008,8 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20391,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20391, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8843,18 +6019,8 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20363,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20363, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8868,18 +6034,8 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20392,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20392, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -8899,18 +6055,8 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20364,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20364, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -8940,18 +6086,8 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20390,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20390, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -8971,18 +6107,8 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20362,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20362, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -9000,18 +6126,8 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20393,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20393, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9021,18 +6137,8 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 20365,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 20365, -16, -16, 32, 32, 1, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9044,11 +6150,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x0071C4D4 */
 static void mine_train_rc_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9058,17 +6160,7 @@ static void mine_train_rc_track_diag_flat_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20409,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20409, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -9080,30 +6172,10 @@ static void mine_train_rc_track_diag_flat_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20406,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20406, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20410,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20410, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9131,17 +6203,7 @@ static void mine_train_rc_track_diag_flat_to_left_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20408,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20408, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9157,17 +6219,7 @@ static void mine_train_rc_track_diag_flat_to_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20407,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20407, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -9179,11 +6231,7 @@ static void mine_train_rc_track_diag_flat_to_left_bank(
 
 /** rct2: 0x0071C4B4 */
 static void mine_train_rc_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9193,17 +6241,7 @@ static void mine_train_rc_track_diag_flat_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20414,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20414, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -9215,17 +6253,7 @@ static void mine_train_rc_track_diag_flat_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20411,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20411, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9253,30 +6281,10 @@ static void mine_train_rc_track_diag_flat_to_right_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20413,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20413, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20415,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20415, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9292,17 +6300,7 @@ static void mine_train_rc_track_diag_flat_to_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20412,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20412, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -9314,11 +6312,7 @@ static void mine_train_rc_track_diag_flat_to_right_bank(
 
 /** rct2: 0x0071C4C4 */
 static void mine_train_rc_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9328,17 +6322,7 @@ static void mine_train_rc_track_diag_left_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20412,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20412, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -9350,30 +6334,10 @@ static void mine_train_rc_track_diag_left_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20413,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20413, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20415,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20415, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9401,17 +6365,7 @@ static void mine_train_rc_track_diag_left_bank_to_flat(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20411,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20411, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9427,17 +6381,7 @@ static void mine_train_rc_track_diag_left_bank_to_flat(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20414,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20414, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -9449,11 +6393,7 @@ static void mine_train_rc_track_diag_left_bank_to_flat(
 
 /** rct2: 0x0071C4E4 */
 static void mine_train_rc_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9463,17 +6403,7 @@ static void mine_train_rc_track_diag_right_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20407,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20407, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -9485,17 +6415,7 @@ static void mine_train_rc_track_diag_right_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20408,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20408, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9523,30 +6443,10 @@ static void mine_train_rc_track_diag_right_bank_to_flat(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20406,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20406, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20410,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20410, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9562,17 +6462,7 @@ static void mine_train_rc_track_diag_right_bank_to_flat(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20409,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20409, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -9584,11 +6474,7 @@ static void mine_train_rc_track_diag_right_bank_to_flat(
 
 /** rct2: 0x0071C514 */
 static void mine_train_rc_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9598,17 +6484,7 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20429,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20429, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -9620,30 +6496,10 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20426,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20426, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20430,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20430, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9671,17 +6527,7 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20428,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20428, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9697,17 +6543,7 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20427,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20427, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -9719,11 +6555,7 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x0071C524 */
 static void mine_train_rc_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9733,17 +6565,7 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20434,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20434, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -9755,17 +6577,7 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20431,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20431, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9793,30 +6605,10 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20433,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20433, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20435,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20435, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9832,17 +6624,7 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20432,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20432, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -9854,11 +6636,7 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x0071C4F4 */
 static void mine_train_rc_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9868,17 +6646,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20419,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20419, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -9890,30 +6658,10 @@ static void mine_train_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20416,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20416, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20420,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20420, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9941,17 +6689,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_left_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20418,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20418, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9967,17 +6705,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20417,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20417, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -9989,11 +6717,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x0071C504 */
 static void mine_train_rc_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10003,17 +6727,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20424,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20424, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -10025,17 +6739,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20421,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20421, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -10063,30 +6767,10 @@ static void mine_train_rc_track_diag_25_deg_up_to_right_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20423,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20423, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20425,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20425, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -10102,17 +6786,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20422,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20422, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -10124,11 +6798,7 @@ static void mine_train_rc_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x0071C534 */
 static void mine_train_rc_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10138,17 +6808,7 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20422,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20422, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -10158,30 +6818,10 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20423,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20423, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20425,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20425, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -10207,17 +6847,7 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20421,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20421, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -10231,17 +6861,7 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20424,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20424, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -10254,11 +6874,7 @@ static void mine_train_rc_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x0071C544 */
 static void mine_train_rc_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10268,17 +6884,7 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20417,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20417, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -10288,17 +6894,7 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20418,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20418, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -10324,30 +6920,10 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20416,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20416, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20420,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20420, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_b_supports_paint_setup(session, 8, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -10361,17 +6937,7 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20419,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20419, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -10384,11 +6950,7 @@ static void mine_train_rc_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x0071C554 */
 static void mine_train_rc_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10398,17 +6960,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20432,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20432, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -10420,30 +6972,10 @@ static void mine_train_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20433,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20433, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20435,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20435, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -10471,17 +7003,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_left_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20431,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20431, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -10497,17 +7019,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20434,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20434, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -10519,11 +7031,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x0071C564 */
 static void mine_train_rc_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10533,17 +7041,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20427,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20427, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -10555,17 +7053,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20428,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20428, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -10593,30 +7081,10 @@ static void mine_train_rc_track_diag_25_deg_down_to_right_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20426,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20426, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20430,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20430, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -10632,17 +7100,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20429,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        1,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20429, -16, -16, 32, 32, 1, height, -16, -16,
                         height);
                     break;
             }
@@ -10654,11 +7112,7 @@ static void mine_train_rc_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x0071C3D4 */
 static void mine_train_rc_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10668,17 +7122,7 @@ static void mine_train_rc_track_diag_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20405,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20405, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10691,17 +7135,7 @@ static void mine_train_rc_track_diag_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20402,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20402, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -10730,17 +7164,7 @@ static void mine_train_rc_track_diag_left_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20404,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20404, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -10757,17 +7181,7 @@ static void mine_train_rc_track_diag_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20403,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20403, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10780,11 +7194,7 @@ static void mine_train_rc_track_diag_left_bank(
 
 /** rct2: 0x0071C3E4 */
 static void mine_train_rc_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10794,17 +7204,7 @@ static void mine_train_rc_track_diag_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20403,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20403, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10817,17 +7217,7 @@ static void mine_train_rc_track_diag_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20404,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20404, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -10856,17 +7246,7 @@ static void mine_train_rc_track_diag_right_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20402,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20402, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -10883,17 +7263,7 @@ static void mine_train_rc_track_diag_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 20405,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 20405, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10906,11 +7276,7 @@ static void mine_train_rc_track_diag_right_bank(
 
 /** rct2: 0x0071C574 */
 static void mine_train_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
diff --git a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp
index 129455eee9..ed4b751bff 100644
--- a/src/openrct2/ride/coaster/MiniRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/MiniRollerCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x008A4ABC */
 static void mini_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -103,11 +99,7 @@ static void mini_rc_track_flat(
 }
 
 static void mini_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -120,33 +112,13 @@ static void mini_rc_track_station(
     if (track_element_get_type(tileElement) == TRACK_ELEM_END_STATION)
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            1,
-            height,
-            0,
-            6,
+            session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
             height + 3);
     }
     else
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            1,
-            height,
-            0,
-            6,
+            session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
             height + 3);
     }
     sub_98196C_rotated(
@@ -160,11 +132,7 @@ static void mini_rc_track_station(
 
 /** rct2: 0x008A4ACC */
 static void mini_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -266,11 +234,7 @@ static void mini_rc_track_25_deg_up(
 
 /** rct2: 0x008A4ADC */
 static void mini_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -327,11 +291,7 @@ static void mini_rc_track_60_deg_up(
 
 /** rct2: 0x008A4AEC */
 static void mini_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -433,11 +393,7 @@ static void mini_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x008A4AFC */
 static void mini_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -498,11 +454,7 @@ static void mini_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008A4B0C */
 static void mini_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -563,11 +515,7 @@ static void mini_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A4B1C */
 static void mini_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -669,11 +617,7 @@ static void mini_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x008A4B2C */
 static void mini_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -681,11 +625,7 @@ static void mini_rc_track_25_deg_down(
 
 /** rct2: 0x008A4B3C */
 static void mini_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -693,11 +633,7 @@ static void mini_rc_track_60_deg_down(
 
 /** rct2: 0x008A4B4C */
 static void mini_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -705,11 +641,7 @@ static void mini_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008A4B5C */
 static void mini_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -717,11 +649,7 @@ static void mini_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008A4B6C */
 static void mini_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -729,11 +657,7 @@ static void mini_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A4B7C */
 static void mini_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -741,11 +665,7 @@ static void mini_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x008A4B8C */
 static void mini_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -802,32 +722,12 @@ static void mini_rc_track_left_quarter_turn_5(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18860,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18860, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18845,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18845, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -835,8 +735,7 @@ static void mini_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -844,47 +743,17 @@ static void mini_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18849,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18849, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18854,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18854, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18859,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18859, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -904,17 +773,7 @@ static void mini_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18848,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18848, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -927,17 +786,7 @@ static void mini_rc_track_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18843,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18843, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -945,8 +794,7 @@ static void mini_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -995,11 +843,7 @@ static void mini_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x008A4B9C */
 static void mini_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1008,11 +852,7 @@ static void mini_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x008A4BAC */
 static void mini_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1066,11 +906,7 @@ static void mini_rc_track_flat_to_left_bank(
 
 /** rct2: 0x008A4BBC */
 static void mini_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1124,11 +960,7 @@ static void mini_rc_track_flat_to_right_bank(
 
 /** rct2: 0x008A4BCC */
 static void mini_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1182,11 +1014,7 @@ static void mini_rc_track_left_bank_to_flat(
 
 /** rct2: 0x008A4BDC */
 static void mini_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1240,11 +1068,7 @@ static void mini_rc_track_right_bank_to_flat(
 
 /** rct2: 0x008A4BEC */
 static void mini_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1256,34 +1080,14 @@ static void mini_rc_track_banked_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18871, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18882,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18882, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18876,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18876, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -1321,47 +1125,17 @@ static void mini_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18875,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18875, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18880,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18880, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18865,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18865, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -1369,8 +1143,7 @@ static void mini_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -1378,47 +1151,17 @@ static void mini_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18869,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18869, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18874,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18874, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18879,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18879, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -1438,32 +1181,12 @@ static void mini_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18868,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18868, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18873,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18873, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -1472,17 +1195,7 @@ static void mini_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18863,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18863, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -1490,8 +1203,7 @@ static void mini_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -1505,17 +1217,7 @@ static void mini_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18872,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18872, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -1524,17 +1226,7 @@ static void mini_rc_track_banked_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18877, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18883,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18883, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -1564,11 +1256,7 @@ static void mini_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x008A4BFC */
 static void mini_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1577,11 +1265,7 @@ static void mini_rc_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x008A4C0C */
 static void mini_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1642,11 +1326,7 @@ static void mini_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x008A4C1C */
 static void mini_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1707,11 +1387,7 @@ static void mini_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x008A4C2C */
 static void mini_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1772,11 +1448,7 @@ static void mini_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x008A4C3C */
 static void mini_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1837,11 +1509,7 @@ static void mini_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x008A4C4C */
 static void mini_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1849,11 +1517,7 @@ static void mini_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x008A4C5C */
 static void mini_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1861,11 +1525,7 @@ static void mini_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x008A4C6C */
 static void mini_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1873,11 +1533,7 @@ static void mini_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x008A4C7C */
 static void mini_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1885,11 +1541,7 @@ static void mini_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x008A4C8C */
 static void mini_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1939,11 +1591,7 @@ static void mini_rc_track_left_bank(
 
 /** rct2: 0x008A4C9C */
 static void mini_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1951,11 +1599,7 @@ static void mini_rc_track_right_bank(
 
 /** rct2: 0x008A4CAC */
 static void mini_rc_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2012,32 +1656,12 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18947,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18947, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18952,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18952, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -2045,8 +1669,7 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -2054,47 +1677,17 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18938,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18938, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18943,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18943, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18948,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18948, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -2114,17 +1707,7 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18939,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18939, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -2137,17 +1720,7 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18954,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18954, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -2155,8 +1728,7 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -2205,11 +1777,7 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A4CBC */
 static void mini_rc_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2258,32 +1826,12 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18917,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18917, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18922,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18922, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -2299,8 +1847,7 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -2312,47 +1859,17 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18923,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18923, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18928,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18928, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18933,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18933, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -2368,17 +1885,7 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18919,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18919, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -2391,17 +1898,7 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18934,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18934, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -2409,8 +1906,7 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -2459,11 +1955,7 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A4CCC */
 static void mini_rc_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2472,11 +1964,7 @@ static void mini_rc_track_left_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A4CDC */
 static void mini_rc_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2485,11 +1973,7 @@ static void mini_rc_track_right_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A4CEC */
 static void mini_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2558,8 +2042,7 @@ static void mini_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2590,8 +2073,7 @@ static void mini_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2640,11 +2122,7 @@ static void mini_rc_track_s_bend_left(
 
 /** rct2: 0x008A4CFC */
 static void mini_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2713,8 +2191,7 @@ static void mini_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2745,8 +2222,7 @@ static void mini_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2795,11 +2271,7 @@ static void mini_rc_track_s_bend_right(
 
 /** rct2: 0x008A4D3C */
 static void mini_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2848,17 +2320,7 @@ static void mini_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18820,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18820, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -2867,32 +2329,12 @@ static void mini_rc_track_left_quarter_turn_3(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18826,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18826, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18817,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18817, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -2946,11 +2388,7 @@ static void mini_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x008A4D4C */
 static void mini_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -2959,11 +2397,7 @@ static void mini_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x008A4D5C */
 static void mini_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2975,34 +2409,14 @@ static void mini_rc_track_left_quarter_turn_3_bank(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18833, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18840,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18840, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18836,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18836, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3036,62 +2450,22 @@ static void mini_rc_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18832,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18832, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18835,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18835, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18838,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18838, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18829,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18829, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -3110,17 +2484,7 @@ static void mini_rc_track_left_quarter_turn_3_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18834,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18834, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3129,17 +2493,7 @@ static void mini_rc_track_left_quarter_turn_3_bank(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18837, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18841,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18841, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3169,11 +2523,7 @@ static void mini_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x008A4D6C */
 static void mini_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3182,11 +2532,7 @@ static void mini_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x008A4D7C */
 static void mini_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3279,11 +2625,7 @@ static void mini_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A4D8C */
 static void mini_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3376,11 +2718,7 @@ static void mini_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A4D9C */
 static void mini_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3389,11 +2727,7 @@ static void mini_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A4DAC */
 static void mini_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3402,11 +2736,7 @@ static void mini_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A4DBC */
 static void mini_rc_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3418,34 +2748,14 @@ static void mini_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18991, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18998,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18998, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18994,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18994, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3468,10 +2778,8 @@ static void mini_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -3482,62 +2790,22 @@ static void mini_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18990,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18990, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18993,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18993, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18996,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18996, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18987,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18987, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -3556,17 +2824,7 @@ static void mini_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18992,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18992, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 12, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3575,17 +2833,7 @@ static void mini_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18995, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18999,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18999, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3607,10 +2855,8 @@ static void mini_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -3626,34 +2872,14 @@ static void mini_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18991, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18998,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18998, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18994,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18994, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3675,10 +2901,8 @@ static void mini_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -3689,62 +2913,22 @@ static void mini_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18987,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18987, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18990,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18990, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18993,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18993, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18996,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18996, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -3769,17 +2953,7 @@ static void mini_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18992,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18992, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 12, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3788,17 +2962,7 @@ static void mini_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18995, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18999,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18999, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3809,10 +2973,8 @@ static void mini_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -3820,11 +2982,7 @@ static void mini_rc_track_left_half_banked_helix_up_small(
 
 /** rct2: 0x008A4DCC */
 static void mini_rc_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3846,17 +3004,7 @@ static void mini_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18978,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18978, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 9, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3865,17 +3013,7 @@ static void mini_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18981, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18985,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18985, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 11, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -3886,10 +3024,8 @@ static void mini_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -3900,62 +3036,22 @@ static void mini_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18973,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18973, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18976,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18976, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18979,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18979, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18982,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18982, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -3976,34 +3072,14 @@ static void mini_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18977, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18984,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18984, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18980,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18980, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4025,10 +3101,8 @@ static void mini_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -4042,17 +3116,7 @@ static void mini_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18978,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18978, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 9, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4061,17 +3125,7 @@ static void mini_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18981, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18985,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18985, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 11, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4093,10 +3147,8 @@ static void mini_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -4107,62 +3159,22 @@ static void mini_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18976,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18976, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18979,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18979, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18982,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18982, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18973,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18973, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -4177,34 +3189,14 @@ static void mini_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 18977, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18984,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18984, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 15, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 18980,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 18980, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4227,10 +3219,8 @@ static void mini_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -4238,11 +3228,7 @@ static void mini_rc_track_right_half_banked_helix_up_small(
 
 /** rct2: 0x008A4DDC */
 static void mini_rc_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -4256,11 +3242,7 @@ static void mini_rc_track_left_half_banked_helix_down_small(
 
 /** rct2: 0x008A4DEC */
 static void mini_rc_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -4274,11 +3256,7 @@ static void mini_rc_track_right_half_banked_helix_down_small(
 
 /** rct2: 0x008A4DFC */
 static void mini_rc_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4290,34 +3268,14 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19031, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19042,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19042, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19036,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19036, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4340,10 +3298,8 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -4358,47 +3314,17 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19035,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19035, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19040,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19040, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19025,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19025, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -4406,8 +3332,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -4415,47 +3340,17 @@ static void mini_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19029,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19029, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19034,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19034, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19039,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19039, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -4475,32 +3370,12 @@ static void mini_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19028,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19028, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19033,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19033, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -4509,17 +3384,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19023,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19023, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4527,8 +3392,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -4542,17 +3406,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19032,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19032, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4561,17 +3415,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19037, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19043,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19043, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4593,10 +3437,8 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -4612,34 +3454,14 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19031, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19042,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19042, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19036,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19036, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4661,10 +3483,8 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -4675,17 +3495,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19025,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19025, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -4694,32 +3504,12 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19035,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19035, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19040,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19040, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4727,8 +3517,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -4740,47 +3529,17 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19029,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19029, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19034,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19034, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19039,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19039, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -4796,47 +3555,17 @@ static void mini_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19023,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19023, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19028,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19028, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19033,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19033, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -4848,8 +3577,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -4869,17 +3597,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19032,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19032, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4888,17 +3606,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19037, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19043,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19043, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4909,10 +3617,8 @@ static void mini_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -4920,11 +3626,7 @@ static void mini_rc_track_left_half_banked_helix_up_large(
 
 /** rct2: 0x008A4E0C */
 static void mini_rc_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4946,17 +3648,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19010,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19010, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4965,17 +3657,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19015, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19021,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19021, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4986,10 +3668,8 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -5000,47 +3680,17 @@ static void mini_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19001,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19001, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19006,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19006, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19011,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19011, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -5052,8 +3702,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -5065,47 +3714,17 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19007,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19007, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19012,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19012, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19017,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19017, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5121,17 +3740,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19003,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19003, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -5140,32 +3749,12 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19013,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19013, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19018,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19018, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -5173,8 +3762,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -5190,34 +3778,14 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19009, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19020,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19020, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19014,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19014, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5239,10 +3807,8 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -5256,17 +3822,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19010,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19010, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5275,17 +3831,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19015, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19021,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19021, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 7, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5307,10 +3853,8 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -5321,32 +3865,12 @@ static void mini_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19006,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19006, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19011,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19011, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -5355,17 +3879,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19001,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19001, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -5373,8 +3887,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -5382,47 +3895,17 @@ static void mini_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19007,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19007, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19012,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19012, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19017,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19017, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -5446,47 +3929,17 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19013,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19013, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19018,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19018, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19003,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19003, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5494,8 +3947,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -5505,34 +3957,14 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 19009, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19020,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19020, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19014,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19014, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 13, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5555,10 +3987,8 @@ static void mini_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_6);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -5566,11 +3996,7 @@ static void mini_rc_track_right_half_banked_helix_up_large(
 
 /** rct2: 0x008A4E1C */
 static void mini_rc_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -5584,11 +4010,7 @@ static void mini_rc_track_left_half_banked_helix_down_large(
 
 /** rct2: 0x008A4E2C */
 static void mini_rc_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -5602,11 +4024,7 @@ static void mini_rc_track_right_half_banked_helix_down_large(
 
 /** rct2: 0x008A4E5C */
 static void mini_rc_track_left_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -5643,11 +4061,7 @@ static void mini_rc_track_left_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008A4E3C */
 static void mini_rc_track_right_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -5684,11 +4098,7 @@ static void mini_rc_track_right_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008A4E4C */
 static void mini_rc_track_left_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement);
@@ -5696,11 +4106,7 @@ static void mini_rc_track_left_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008A4E6C */
 static void mini_rc_track_right_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement);
@@ -5708,11 +4114,7 @@ static void mini_rc_track_right_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008A4E7C */
 static void mini_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -5746,11 +4148,7 @@ static void mini_rc_track_brakes(
 
 /** rct2: 0x008A50CC */
 static void mini_rc_track_25_deg_up_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -5807,11 +4205,7 @@ static void mini_rc_track_25_deg_up_left_banked(
 
 /** rct2: 0x008A50DC */
 static void mini_rc_track_25_deg_up_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -5868,11 +4262,7 @@ static void mini_rc_track_25_deg_up_right_banked(
 
 /** rct2: 0x008A4E8C */
 static void mini_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -5918,11 +4308,7 @@ static void mini_rc_track_on_ride_photo(
 
 /** rct2: 0x008A50EC */
 static void mini_rc_track_25_deg_down_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -5930,11 +4316,7 @@ static void mini_rc_track_25_deg_down_left_banked(
 
 /** rct2: 0x008A50FC */
 static void mini_rc_track_25_deg_down_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -5942,11 +4324,7 @@ static void mini_rc_track_25_deg_down_right_banked(
 
 /** rct2: 0x008A4EAC */
 static void mini_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6000,32 +4378,12 @@ static void mini_rc_track_left_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19085,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19085, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19089,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19089, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -6033,8 +4391,7 @@ static void mini_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -6042,47 +4399,17 @@ static void mini_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19078,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19078, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19082,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19082, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19086,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19086, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -6091,10 +4418,8 @@ static void mini_rc_track_left_eighth_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -6107,34 +4432,14 @@ static void mini_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19079,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19079, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 3, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19083,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19083, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6147,17 +4452,7 @@ static void mini_rc_track_left_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19091,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19091, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 2, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6167,8 +4462,7 @@ static void mini_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -6176,11 +4470,7 @@ static void mini_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x008A4EBC */
 static void mini_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6226,32 +4516,12 @@ static void mini_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19061,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19061, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19065,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19065, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -6267,8 +4537,7 @@ static void mini_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -6280,17 +4549,7 @@ static void mini_rc_track_right_eighth_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19066,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19066, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
@@ -6299,25 +4558,13 @@ static void mini_rc_track_right_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19074,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19074, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -6330,17 +4577,7 @@ static void mini_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19063,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19063, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6353,34 +4590,14 @@ static void mini_rc_track_right_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19071,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19071, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 2, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19075,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19075, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 3, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6390,8 +4607,7 @@ static void mini_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -6399,11 +4615,7 @@ static void mini_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x008A4ECC */
 static void mini_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -6412,11 +4624,7 @@ static void mini_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008A4EDC */
 static void mini_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -6425,11 +4633,7 @@ static void mini_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008A4EEC */
 static void mini_rc_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6439,34 +4643,14 @@ static void mini_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19108,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19108, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19112,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19112, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6501,47 +4685,17 @@ static void mini_rc_track_left_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19113,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19113, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19117,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19117, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19121,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19121, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -6549,8 +4703,7 @@ static void mini_rc_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -6558,47 +4711,17 @@ static void mini_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19110,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19110, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19114,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19114, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19118,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19118, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -6607,10 +4730,8 @@ static void mini_rc_track_left_eighth_bank_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -6623,34 +4744,14 @@ static void mini_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19111,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19111, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 3, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19115,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19115, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6663,17 +4764,7 @@ static void mini_rc_track_left_eighth_bank_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19123,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19123, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 2, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6683,8 +4774,7 @@ static void mini_rc_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -6692,11 +4782,7 @@ static void mini_rc_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x008A4EFC */
 static void mini_rc_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6718,34 +4804,14 @@ static void mini_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19100,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19100, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19104,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19104, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6764,47 +4830,17 @@ static void mini_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19093,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19093, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19097,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19097, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19101,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19101, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -6816,8 +4852,7 @@ static void mini_rc_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -6829,55 +4864,23 @@ static void mini_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19098,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19098, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19102,
-                        0,
-                        0,
-                        28,
-                        28,
-                        0,
-                        height,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19102, 0, 0, 28, 28, 0, height, 4, 4,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19106,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19106, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -6890,17 +4893,7 @@ static void mini_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19095,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19095, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 1, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6913,34 +4906,14 @@ static void mini_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19103,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19103, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 2, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19107,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19107, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 3, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6950,8 +4923,7 @@ static void mini_rc_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -6959,11 +4931,7 @@ static void mini_rc_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x008A4F0C */
 static void mini_rc_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -6972,11 +4940,7 @@ static void mini_rc_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008A4F1C */
 static void mini_rc_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -6985,11 +4949,7 @@ static void mini_rc_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008A4E9C */
 static void mini_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7001,18 +4961,8 @@ static void mini_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19189,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19189, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7022,18 +4972,8 @@ static void mini_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19127,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19127, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7048,18 +4988,8 @@ static void mini_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19186,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19186, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7069,18 +4999,8 @@ static void mini_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19124,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19124, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7095,18 +5015,8 @@ static void mini_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19188,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19188, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7116,18 +5026,8 @@ static void mini_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19126,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19126, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7146,18 +5046,8 @@ static void mini_rc_track_diag_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19187,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19187, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7181,18 +5071,8 @@ static void mini_rc_track_diag_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19125,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19125, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7215,11 +5095,7 @@ static void mini_rc_track_diag_flat(
 
 /** rct2: 0x008A4F4C */
 static void mini_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7231,18 +5107,8 @@ static void mini_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19201,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19201, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7252,18 +5118,8 @@ static void mini_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19139,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19139, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7278,18 +5134,8 @@ static void mini_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19198,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19198, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7299,18 +5145,8 @@ static void mini_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19136,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19136, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7325,18 +5161,8 @@ static void mini_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19200,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19200, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7346,18 +5172,8 @@ static void mini_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19138,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19138, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7376,18 +5192,8 @@ static void mini_rc_track_diag_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19199,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19199, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_FORK_ALT, 0, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7411,18 +5217,8 @@ static void mini_rc_track_diag_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19137,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19137, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_FORK_ALT, 0, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7445,11 +5241,7 @@ static void mini_rc_track_diag_25_deg_up(
 
 /** rct2: 0x008A4FAC */
 static void mini_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7459,17 +5251,7 @@ static void mini_rc_track_diag_60_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19151,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19151, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7482,17 +5264,7 @@ static void mini_rc_track_diag_60_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19148,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19148, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7505,17 +5277,7 @@ static void mini_rc_track_diag_60_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19150,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19150, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7532,17 +5294,7 @@ static void mini_rc_track_diag_60_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19149,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19149, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 42, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7565,11 +5317,7 @@ static void mini_rc_track_diag_60_deg_up(
 
 /** rct2: 0x008A4F2C */
 static void mini_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7581,18 +5329,8 @@ static void mini_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19193,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19193, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7602,18 +5340,8 @@ static void mini_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19131,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19131, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7628,18 +5356,8 @@ static void mini_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19190,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19190, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7649,18 +5367,8 @@ static void mini_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19128,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19128, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7675,18 +5383,8 @@ static void mini_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19192,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19192, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7696,18 +5394,8 @@ static void mini_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19130,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19130, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7726,18 +5414,8 @@ static void mini_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19191,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19191, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7761,18 +5439,8 @@ static void mini_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19129,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19129, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7795,11 +5463,7 @@ static void mini_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008A4F8C */
 static void mini_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7809,17 +5473,7 @@ static void mini_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19143,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19143, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7832,17 +5486,7 @@ static void mini_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19140,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19140, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7855,17 +5499,7 @@ static void mini_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19142,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19142, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7882,17 +5516,7 @@ static void mini_rc_track_diag_25_deg_up_to_60_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19141,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19141, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 22, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7915,11 +5539,7 @@ static void mini_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008A4F9C */
 static void mini_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7929,17 +5549,7 @@ static void mini_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19147,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19147, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7952,17 +5562,7 @@ static void mini_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19144,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19144, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -7975,17 +5575,7 @@ static void mini_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19146,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19146, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8002,17 +5592,7 @@ static void mini_rc_track_diag_60_deg_up_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19145,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19145, -16, -16, 16, 16, 3, height, 0, 0,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 27, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8035,11 +5615,7 @@ static void mini_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A4F3C */
 static void mini_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8051,18 +5627,8 @@ static void mini_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19197,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19197, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8072,18 +5638,8 @@ static void mini_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19135,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19135, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8098,18 +5654,8 @@ static void mini_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19194,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19194, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8119,18 +5665,8 @@ static void mini_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19132,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19132, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8145,18 +5681,8 @@ static void mini_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19196,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19196, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8166,18 +5692,8 @@ static void mini_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19134,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19134, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8196,18 +5712,8 @@ static void mini_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19195,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19195, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_FORK_ALT, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8231,18 +5737,8 @@ static void mini_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19133,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19133, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_FORK_ALT, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8265,11 +5761,7 @@ static void mini_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008A4F7C */
 static void mini_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8281,18 +5773,8 @@ static void mini_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19199,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19199, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8302,18 +5784,8 @@ static void mini_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19137,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19137, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8328,18 +5800,8 @@ static void mini_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19200,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19200, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8349,18 +5811,8 @@ static void mini_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19138,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19138, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8375,18 +5827,8 @@ static void mini_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19198,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19198, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8396,18 +5838,8 @@ static void mini_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19136,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19136, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8426,18 +5858,8 @@ static void mini_rc_track_diag_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19201,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19201, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_FORK_ALT, 0, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8461,18 +5883,8 @@ static void mini_rc_track_diag_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19139,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19139, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_FORK_ALT, 0, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8495,11 +5907,7 @@ static void mini_rc_track_diag_25_deg_down(
 
 /** rct2: 0x008A4FDC */
 static void mini_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8509,17 +5917,7 @@ static void mini_rc_track_diag_60_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19149,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19149, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8532,17 +5930,7 @@ static void mini_rc_track_diag_60_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19150,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19150, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8555,17 +5943,7 @@ static void mini_rc_track_diag_60_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19148,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19148, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8582,17 +5960,7 @@ static void mini_rc_track_diag_60_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19151,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19151, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 34, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8615,11 +5983,7 @@ static void mini_rc_track_diag_60_deg_down(
 
 /** rct2: 0x008A4F5C */
 static void mini_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8631,18 +5995,8 @@ static void mini_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19195,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19195, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8652,18 +6006,8 @@ static void mini_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19133,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19133, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8677,18 +6021,8 @@ static void mini_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19196,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19196, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8698,18 +6032,8 @@ static void mini_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19134,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19134, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8723,18 +6047,8 @@ static void mini_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19194,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19194, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8744,18 +6058,8 @@ static void mini_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19132,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19132, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8773,18 +6077,8 @@ static void mini_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19197,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19197, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_FORK_ALT, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8808,18 +6102,8 @@ static void mini_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19135,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19135, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_FORK_ALT, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8843,11 +6127,7 @@ static void mini_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008A4FBC */
 static void mini_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8857,17 +6137,7 @@ static void mini_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19145,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19145, -16, -16, 16, 16, 3, height, 0, 0,
                         height);
                     break;
             }
@@ -8880,17 +6150,7 @@ static void mini_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19146,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19146, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8903,17 +6163,7 @@ static void mini_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19144,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19144, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -8930,17 +6180,7 @@ static void mini_rc_track_diag_25_deg_down_to_60_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19147,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19147, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 23, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8963,11 +6203,7 @@ static void mini_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008A4FCC */
 static void mini_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8977,17 +6213,7 @@ static void mini_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19141,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19141, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9000,17 +6226,7 @@ static void mini_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19142,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19142, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9023,17 +6239,7 @@ static void mini_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19140,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19140, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9050,17 +6256,7 @@ static void mini_rc_track_diag_60_deg_down_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19143,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19143, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -9083,11 +6279,7 @@ static void mini_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A4F6C */
 static void mini_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9099,18 +6291,8 @@ static void mini_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19191,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19191, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9120,18 +6302,8 @@ static void mini_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19129,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19129, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9146,18 +6318,8 @@ static void mini_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19192,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19192, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9167,18 +6329,8 @@ static void mini_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19130,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19130, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9193,18 +6345,8 @@ static void mini_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19190,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19190, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9214,18 +6356,8 @@ static void mini_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19128,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19128, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9244,18 +6376,8 @@ static void mini_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19193,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19193, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9279,18 +6401,8 @@ static void mini_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 19131,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 19131, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9313,11 +6425,7 @@ static void mini_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x008A500C */
 static void mini_rc_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9327,17 +6435,7 @@ static void mini_rc_track_diag_flat_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19159,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19159, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9350,30 +6448,10 @@ static void mini_rc_track_diag_flat_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19156,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19156, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19160,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19160, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -9386,17 +6464,7 @@ static void mini_rc_track_diag_flat_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19158,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19158, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9413,17 +6481,7 @@ static void mini_rc_track_diag_flat_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19157,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19157, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -9446,11 +6504,7 @@ static void mini_rc_track_diag_flat_to_left_bank(
 
 /** rct2: 0x008A501C */
 static void mini_rc_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9460,17 +6514,7 @@ static void mini_rc_track_diag_flat_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19164,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19164, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9483,17 +6527,7 @@ static void mini_rc_track_diag_flat_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19161,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19161, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9506,30 +6540,10 @@ static void mini_rc_track_diag_flat_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19163,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19163, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19165,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19165, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -9546,17 +6560,7 @@ static void mini_rc_track_diag_flat_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19162,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19162, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -9579,11 +6583,7 @@ static void mini_rc_track_diag_flat_to_right_bank(
 
 /** rct2: 0x008A502C */
 static void mini_rc_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9593,17 +6593,7 @@ static void mini_rc_track_diag_left_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19162,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19162, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9616,30 +6606,10 @@ static void mini_rc_track_diag_left_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19163,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19163, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19165,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19165, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -9652,17 +6622,7 @@ static void mini_rc_track_diag_left_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19161,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19161, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9679,17 +6639,7 @@ static void mini_rc_track_diag_left_bank_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19164,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19164, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -9712,11 +6662,7 @@ static void mini_rc_track_diag_left_bank_to_flat(
 
 /** rct2: 0x008A503C */
 static void mini_rc_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9726,17 +6672,7 @@ static void mini_rc_track_diag_right_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19157,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19157, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9749,17 +6685,7 @@ static void mini_rc_track_diag_right_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19158,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19158, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9772,30 +6698,10 @@ static void mini_rc_track_diag_right_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19156,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19156, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19160,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19160, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -9812,17 +6718,7 @@ static void mini_rc_track_diag_right_bank_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19159,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19159, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -9845,11 +6741,7 @@ static void mini_rc_track_diag_right_bank_to_flat(
 
 /** rct2: 0x008A506C */
 static void mini_rc_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9859,17 +6751,7 @@ static void mini_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19179,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19179, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9882,30 +6764,10 @@ static void mini_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19176,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19176, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19180,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19180, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -9918,17 +6780,7 @@ static void mini_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19178,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19178, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -9945,17 +6797,7 @@ static void mini_rc_track_diag_left_bank_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19177,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19177, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -9978,11 +6820,7 @@ static void mini_rc_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x008A507C */
 static void mini_rc_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9992,17 +6830,7 @@ static void mini_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19184,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19184, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10015,17 +6843,7 @@ static void mini_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19181,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19181, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10038,30 +6856,10 @@ static void mini_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19183,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19183, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19185,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19185, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -10078,17 +6876,7 @@ static void mini_rc_track_diag_right_bank_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19182,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19182, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10111,11 +6899,7 @@ static void mini_rc_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x008A504C */
 static void mini_rc_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10125,17 +6909,7 @@ static void mini_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19169,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19169, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10148,30 +6922,10 @@ static void mini_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19166,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19166, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19170,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19170, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -10184,17 +6938,7 @@ static void mini_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19168,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19168, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10211,17 +6955,7 @@ static void mini_rc_track_diag_25_deg_up_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19167,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19167, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10244,11 +6978,7 @@ static void mini_rc_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x008A505C */
 static void mini_rc_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10258,17 +6988,7 @@ static void mini_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19174,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19174, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10281,17 +7001,7 @@ static void mini_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19171,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19171, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10304,30 +7014,10 @@ static void mini_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19173,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19173, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19175,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19175, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -10344,17 +7034,7 @@ static void mini_rc_track_diag_25_deg_up_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19172,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19172, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10377,11 +7057,7 @@ static void mini_rc_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x008A508C */
 static void mini_rc_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10391,17 +7067,7 @@ static void mini_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19172,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19172, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10413,30 +7079,10 @@ static void mini_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19173,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19173, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19175,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19175, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -10448,17 +7094,7 @@ static void mini_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19171,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19171, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10474,17 +7110,7 @@ static void mini_rc_track_diag_left_bank_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19174,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19174, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10508,11 +7134,7 @@ static void mini_rc_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x008A509C */
 static void mini_rc_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10522,17 +7144,7 @@ static void mini_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19167,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19167, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10544,17 +7156,7 @@ static void mini_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19168,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19168, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10566,30 +7168,10 @@ static void mini_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19166,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19166, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19170,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19170, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -10605,17 +7187,7 @@ static void mini_rc_track_diag_right_bank_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19169,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19169, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 10, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10639,11 +7211,7 @@ static void mini_rc_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x008A50AC */
 static void mini_rc_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10653,17 +7221,7 @@ static void mini_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19182,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19182, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10676,30 +7234,10 @@ static void mini_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19183,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19183, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19185,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19185, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -10712,17 +7250,7 @@ static void mini_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19181,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19181, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10739,17 +7267,7 @@ static void mini_rc_track_diag_25_deg_down_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19184,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19184, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10772,11 +7290,7 @@ static void mini_rc_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x008A50BC */
 static void mini_rc_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10786,17 +7300,7 @@ static void mini_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19177,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19177, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10809,17 +7313,7 @@ static void mini_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19178,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19178, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10832,30 +7326,10 @@ static void mini_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19176,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19176, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19180,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19180, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -10872,17 +7346,7 @@ static void mini_rc_track_diag_25_deg_down_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19179,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19179, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10905,11 +7369,7 @@ static void mini_rc_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x008A4FEC */
 static void mini_rc_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10919,17 +7379,7 @@ static void mini_rc_track_diag_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19155,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19155, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10942,17 +7392,7 @@ static void mini_rc_track_diag_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19152,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19152, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -10965,17 +7405,7 @@ static void mini_rc_track_diag_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19154,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19154, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10992,17 +7422,7 @@ static void mini_rc_track_diag_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19153,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19153, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11025,11 +7445,7 @@ static void mini_rc_track_diag_left_bank(
 
 /** rct2: 0x008A4FFC */
 static void mini_rc_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11039,17 +7455,7 @@ static void mini_rc_track_diag_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19153,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19153, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11062,17 +7468,7 @@ static void mini_rc_track_diag_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19154,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19154, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11085,17 +7481,7 @@ static void mini_rc_track_diag_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19152,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19152, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -11112,17 +7498,7 @@ static void mini_rc_track_diag_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19155,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19155, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11145,11 +7521,7 @@ static void mini_rc_track_diag_right_bank(
 
 /** rct2: 0x008A530C */
 static void mini_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -11183,11 +7555,7 @@ static void mini_rc_track_block_brakes(
 
 /** rct2: 0x008A510C */
 static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11203,17 +7571,7 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19319,
-                        0,
-                        6,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19319, 0, 6, 32, 1, 34, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11256,34 +7614,14 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19318,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19318, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19320,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19320, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11313,11 +7651,7 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A511C */
 static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11339,17 +7673,7 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19310,
-                        0,
-                        6,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19310, 0, 6, 32, 1, 34, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11386,34 +7710,14 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19309,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19309, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19311,
-                        6,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19311, 6, 0, 1, 32, 34, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11443,11 +7747,7 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A512C */
 static void mini_rc_track_left_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -11457,11 +7757,7 @@ static void mini_rc_track_left_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A513C */
 static void mini_rc_track_right_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -11471,11 +7767,7 @@ static void mini_rc_track_right_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A514C */
 static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11491,17 +7783,7 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19291,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19291, 0, 0, 32, 1, 34, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11539,47 +7821,17 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19292,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19292, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19297,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19297, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19302,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19302, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -11587,8 +7839,7 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -11596,47 +7847,17 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19288,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19288, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19293,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19293, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19298,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19298, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -11656,62 +7877,22 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19289,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19289, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19294,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19294, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19299,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19299, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19304,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19304, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -11719,8 +7900,7 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -11734,34 +7914,14 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19295,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19295, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19300,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19300, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11791,11 +7951,7 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A515C */
 static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11817,17 +7973,7 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19276,
-                        0,
-                        0,
-                        32,
-                        1,
-                        34,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19276, 0, 0, 32, 1, 34, height, 0, 27,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11855,47 +8001,17 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19267,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19267, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19272,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19272, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19277,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19277, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 3:
@@ -11907,8 +8023,7 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -11920,47 +8035,17 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19273,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19273, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19278,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19278, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19283,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19283, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -11976,62 +8061,22 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19269,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19269, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19274,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19274, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19279,
-                        0,
-                        0,
-                        1,
-                        1,
-                        34,
-                        height,
-                        30,
-                        30,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19279, 0, 0, 1, 1, 34, height, 30, 30,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19284,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19284, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -12039,8 +8084,7 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -12054,34 +8098,14 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19275,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19275, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 19280,
-                        0,
-                        0,
-                        1,
-                        32,
-                        34,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 19280, 0, 0, 1, 32, 34, height, 27, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_FORK_ALT, 4, 14, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12111,11 +8135,7 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A516C */
 static void mini_rc_track_left_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -12125,11 +8145,7 @@ static void mini_rc_track_left_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A517C */
 static void mini_rc_track_right_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -12139,11 +8155,7 @@ static void mini_rc_track_right_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A518C */
 static void mini_rc_track_25_deg_up_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12202,11 +8214,7 @@ static void mini_rc_track_25_deg_up_to_left_banked_25_deg_up(
 
 /** rct2: 0x008A519C */
 static void mini_rc_track_25_deg_up_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12265,11 +8273,7 @@ static void mini_rc_track_25_deg_up_to_right_banked_25_deg_up(
 
 /** rct2: 0x008A51AC */
 static void mini_rc_track_left_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12328,11 +8332,7 @@ static void mini_rc_track_left_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A51BC */
 static void mini_rc_track_right_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12391,11 +8391,7 @@ static void mini_rc_track_right_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A51CC */
 static void mini_rc_track_25_deg_down_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_right_banked_25_deg_up_to_25_deg_up(
@@ -12404,11 +8400,7 @@ static void mini_rc_track_25_deg_down_to_left_banked_25_deg_down(
 
 /** rct2: 0x008A51DC */
 static void mini_rc_track_25_deg_down_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_left_banked_25_deg_up_to_25_deg_up(
@@ -12417,11 +8409,7 @@ static void mini_rc_track_25_deg_down_to_right_banked_25_deg_down(
 
 /** rct2: 0x008A51EC */
 static void mini_rc_track_left_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_25_deg_up_to_right_banked_25_deg_up(
@@ -12430,11 +8418,7 @@ static void mini_rc_track_left_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A51FC */
 static void mini_rc_track_right_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_25_deg_up_to_left_banked_25_deg_up(
@@ -12443,11 +8427,7 @@ static void mini_rc_track_right_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A520C */
 static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12504,11 +8484,7 @@ static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x008A521C */
 static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12565,11 +8541,7 @@ static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x008A524C */
 static void mini_rc_track_left_banked_25_deg_up_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12626,11 +8598,7 @@ static void mini_rc_track_left_banked_25_deg_up_to_left_banked_flat(
 
 /** rct2: 0x008A525C */
 static void mini_rc_track_right_banked_25_deg_up_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12687,11 +8655,7 @@ static void mini_rc_track_right_banked_25_deg_up_to_right_banked_flat(
 
 /** rct2: 0x008A526C */
 static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_right_banked_25_deg_up_to_right_banked_flat(
@@ -12700,11 +8664,7 @@ static void mini_rc_track_left_banked_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x008A527C */
 static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_left_banked_25_deg_up_to_left_banked_flat(
@@ -12713,11 +8673,7 @@ static void mini_rc_track_right_banked_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x008A522C */
 static void mini_rc_track_left_banked_25_deg_down_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_right_banked_flat_to_right_banked_25_deg_up(
@@ -12726,11 +8682,7 @@ static void mini_rc_track_left_banked_25_deg_down_to_left_banked_flat(
 
 /** rct2: 0x008A523C */
 static void mini_rc_track_right_banked_25_deg_down_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_left_banked_flat_to_left_banked_25_deg_up(
@@ -12739,11 +8691,7 @@ static void mini_rc_track_right_banked_25_deg_down_to_right_banked_flat(
 
 /** rct2: 0x008A528C */
 static void mini_rc_track_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12802,11 +8750,7 @@ static void mini_rc_track_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x008A529C */
 static void mini_rc_track_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12865,11 +8809,7 @@ static void mini_rc_track_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x008A52AC */
 static void mini_rc_track_left_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12928,11 +8868,7 @@ static void mini_rc_track_left_banked_25_deg_up_to_flat(
 
 /** rct2: 0x008A52BC */
 static void mini_rc_track_right_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -12991,11 +8927,7 @@ static void mini_rc_track_right_banked_25_deg_up_to_flat(
 
 /** rct2: 0x008A52CC */
 static void mini_rc_track_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -13003,11 +8935,7 @@ static void mini_rc_track_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x008A52DC */
 static void mini_rc_track_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -13015,11 +8943,7 @@ static void mini_rc_track_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x008A52EC */
 static void mini_rc_track_left_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -13027,22 +8951,14 @@ static void mini_rc_track_left_banked_25_deg_down_to_flat(
 
 /** rct2: 0x008A52FC */
 static void mini_rc_track_right_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void mini_rc_track_left_curved_lift_hill(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13134,11 +9050,7 @@ static void mini_rc_track_left_curved_lift_hill(
 }
 
 static void mini_rc_track_right_curved_lift_hill(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13230,11 +9142,7 @@ static void mini_rc_track_right_curved_lift_hill(
 }
 
 static void mini_rc_track_booster(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     // These offsets could be moved to the g2.dat file when that supports offsets.
@@ -13248,18 +9156,8 @@ static void mini_rc_track_booster(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | SPR_G2_MINI_RC_BOOSTER_NE_SW,
-                ne_sw_offsetX,
-                ne_sw_offsetY,
-                32,
-                20,
-                3,
-                height,
-                0,
-                6,
-                height);
+                session, direction, session->TrackColours[SCHEME_TRACK] | SPR_G2_MINI_RC_BOOSTER_NE_SW, ne_sw_offsetX,
+                ne_sw_offsetY, 32, 20, 3, height, 0, 6, height);
             if (track_paint_util_should_paint_supports(session->MapPosition))
             {
                 metal_a_supports_paint_setup(
@@ -13269,18 +9167,8 @@ static void mini_rc_track_booster(
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | SPR_G2_MINI_RC_BOOSTER_NW_SE,
-                nw_se_offsetX,
-                nw_se_offsetY,
-                32,
-                20,
-                3,
-                height,
-                0,
-                6,
-                height);
+                session, direction, session->TrackColours[SCHEME_TRACK] | SPR_G2_MINI_RC_BOOSTER_NW_SE, nw_se_offsetX,
+                nw_se_offsetY, 32, 20, 3, height, 0, 6, height);
             if (track_paint_util_should_paint_supports(session->MapPosition))
             {
                 metal_a_supports_paint_setup(
diff --git a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp
index cc47a02cd6..c5347e196d 100644
--- a/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp
+++ b/src/openrct2/ride/coaster/MiniSuspendedCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x008AFE9C */
 static void mini_suspended_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -86,11 +82,7 @@ static void mini_suspended_rc_track_flat(
 
 /** rct2: 0x008AFF4C, 0x008AFF5C, 0x008AFF6C */
 static void mini_suspended_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -105,17 +97,7 @@ static void mini_suspended_rc_track_station(
     sub_98196C_rotated(
         session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 6, 32, 20, 1, height + 24);
     sub_98199C_rotated(
-        session,
-        direction,
-        imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS],
-        0,
-        6,
-        32,
-        20,
-        1,
-        height + 24,
-        0,
-        2,
+        session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 1, height + 24, 0, 2,
         height);
     track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 3);
     track_paint_util_draw_station_inverted(session, rideIndex, direction, height, tileElement, STATION_VARIANT_1);
@@ -126,11 +108,7 @@ static void mini_suspended_rc_track_station(
 
 /** rct2: 0x008AFEAC */
 static void mini_suspended_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -139,62 +117,22 @@ static void mini_suspended_rc_track_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28435,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28435, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 40);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28441,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28441, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 40);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28437,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28437, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 40);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28442,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28442, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 40);
                 break;
         }
@@ -205,62 +143,22 @@ static void mini_suspended_rc_track_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28385,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28385, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 40);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28391,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28391, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 40);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28387,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28387, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 40);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28392,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28392, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 40);
                 break;
         }
@@ -304,11 +202,7 @@ static void mini_suspended_rc_track_25_deg_up(
 
 /** rct2: 0x008AFEBC */
 static void mini_suspended_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -317,62 +211,22 @@ static void mini_suspended_rc_track_flat_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28436,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28436, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28443,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28443, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28438,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28438, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28444,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28444, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -383,62 +237,22 @@ static void mini_suspended_rc_track_flat_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28386,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28386, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28393,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28393, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28388,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28388, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28394,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28394, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -482,11 +296,7 @@ static void mini_suspended_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x008AFECC */
 static void mini_suspended_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -495,62 +305,22 @@ static void mini_suspended_rc_track_25_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28440,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28440, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28446,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28446, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28439,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28439, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28445,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28445, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -561,62 +331,22 @@ static void mini_suspended_rc_track_25_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28390,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28390, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28396,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28396, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28389,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28389, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 28395,
-                    0,
-                    6,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 28395, 0, 6, 32, 20, 1, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -660,11 +390,7 @@ static void mini_suspended_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x008AFEDC */
 static void mini_suspended_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_suspended_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -672,11 +398,7 @@ static void mini_suspended_rc_track_25_deg_down(
 
 /** rct2: 0x008AFEEC */
 static void mini_suspended_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_suspended_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -684,11 +406,7 @@ static void mini_suspended_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008AFEFC */
 static void mini_suspended_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     mini_suspended_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -696,11 +414,7 @@ static void mini_suspended_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x008AFF0C */
 static void mini_suspended_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -727,10 +441,8 @@ static void mini_suspended_rc_track_left_quarter_turn_5(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -778,8 +490,7 @@ static void mini_suspended_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -833,8 +544,7 @@ static void mini_suspended_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -859,10 +569,8 @@ static void mini_suspended_rc_track_left_quarter_turn_5(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -893,11 +601,7 @@ static void mini_suspended_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x008AFF1C */
 static void mini_suspended_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -906,11 +610,7 @@ static void mini_suspended_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x008AFF2C */
 static void mini_suspended_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -983,8 +683,7 @@ static void mini_suspended_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -1024,8 +723,7 @@ static void mini_suspended_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 2:
@@ -1093,11 +791,7 @@ static void mini_suspended_rc_track_s_bend_left(
 
 /** rct2: 0x008AFF3C */
 static void mini_suspended_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1170,8 +864,7 @@ static void mini_suspended_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -1211,8 +904,7 @@ static void mini_suspended_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 2:
@@ -1280,11 +972,7 @@ static void mini_suspended_rc_track_s_bend_right(
 
 /** rct2: 0x008AFF7C */
 static void mini_suspended_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1311,10 +999,8 @@ static void mini_suspended_rc_track_left_quarter_turn_3(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -1384,10 +1070,8 @@ static void mini_suspended_rc_track_left_quarter_turn_3(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -1418,11 +1102,7 @@ static void mini_suspended_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x008AFF8C */
 static void mini_suspended_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -1431,11 +1111,7 @@ static void mini_suspended_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x008AFFAC */
 static void mini_suspended_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1445,62 +1121,22 @@ static void mini_suspended_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28475,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28475, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28479,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28479, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28483,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28483, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28487,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28487, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 24);
                     break;
             }
@@ -1532,62 +1168,22 @@ static void mini_suspended_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28476,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28476, 0, 0, 32, 16, 1, height + 24, 0, 0,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28480,
-                        0,
-                        0,
-                        34,
-                        16,
-                        1,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28480, 0, 0, 34, 16, 1, height + 24, 0, 0,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28484,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28484, 0, 0, 32, 16, 1, height + 24, 0, 16,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28488,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28488, 0, 0, 32, 16, 1, height + 24, 0, 16,
                         height + 24);
                     break;
             }
@@ -1595,8 +1191,7 @@ static void mini_suspended_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -1604,70 +1199,28 @@ static void mini_suspended_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28477,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28477, 0, 0, 16, 16, 1, height + 24, 0, 16,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28481,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height + 24,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28481, 0, 0, 16, 16, 1, height + 24, 16, 16,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28485,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28485, 0, 0, 16, 16, 1, height + 24, 16, 0,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28489,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28489, 0, 0, 16, 16, 1, height + 24, 0, 0,
                         height + 24);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -1680,62 +1233,22 @@ static void mini_suspended_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28478,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height + 24,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28478, 0, 0, 16, 16, 1, height + 24, 16, 16,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28482,
-                        0,
-                        0,
-                        16,
-                        18,
-                        1,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28482, 0, 0, 16, 18, 1, height + 24, 0, 16,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28486,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28486, 0, 0, 16, 16, 1, height + 24, 0, 0,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28490,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28490, 0, 0, 16, 16, 1, height + 24, 16, 0,
                         height + 24);
                     break;
             }
@@ -1744,8 +1257,7 @@ static void mini_suspended_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -1773,11 +1285,7 @@ static void mini_suspended_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x008AFFBC */
 static void mini_suspended_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1787,62 +1295,22 @@ static void mini_suspended_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28459,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28459, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28463,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28463, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28467,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28467, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28471,
-                        0,
-                        0,
-                        32,
-                        20,
-                        1,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28471, 0, 0, 32, 20, 1, height + 24, 0, 6,
                         height + 24);
                     break;
             }
@@ -1874,62 +1342,22 @@ static void mini_suspended_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28460,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28460, 0, 0, 32, 16, 1, height + 24, 0, 16,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28464,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28464, 0, 0, 32, 16, 1, height + 24, 0, 16,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28468,
-                        0,
-                        0,
-                        34,
-                        16,
-                        1,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28468, 0, 0, 34, 16, 1, height + 24, 0, 0,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28472,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28472, 0, 0, 32, 16, 1, height + 24, 0, 0,
                         height + 24);
                     break;
             }
@@ -1937,8 +1365,7 @@ static void mini_suspended_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -1946,70 +1373,28 @@ static void mini_suspended_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28461,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28461, 0, 0, 16, 16, 1, height + 24, 0, 0,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28465,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28465, 0, 0, 16, 16, 1, height + 24, 16, 0,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28469,
-                        0,
-                        0,
-                        28,
-                        28,
-                        1,
-                        height + 24,
-                        4,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28469, 0, 0, 28, 28, 1, height + 24, 4, 2,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28473,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28473, 0, 0, 16, 16, 1, height + 24, 0, 16,
                         height + 24);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -2022,62 +1407,22 @@ static void mini_suspended_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28462,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height + 24,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28462, 0, 0, 16, 16, 1, height + 24, 16, 0,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28466,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height + 24,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28466, 0, 0, 16, 16, 1, height + 24, 0, 0,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28470,
-                        0,
-                        0,
-                        16,
-                        18,
-                        1,
-                        height + 24,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28470, 0, 0, 16, 18, 1, height + 24, 0, 16,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28474,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height + 24,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28474, 0, 0, 16, 16, 1, height + 24, 16, 16,
                         height + 24);
                     break;
             }
@@ -2086,8 +1431,7 @@ static void mini_suspended_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -2115,11 +1459,7 @@ static void mini_suspended_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x008AFFCC */
 static void mini_suspended_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -2128,11 +1468,7 @@ static void mini_suspended_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008AFFDC */
 static void mini_suspended_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -2141,11 +1477,7 @@ static void mini_suspended_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008AFF9C */
 static void mini_suspended_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2157,18 +1489,8 @@ static void mini_suspended_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28510,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28510, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 24);
                         break;
                 }
             }
@@ -2178,18 +1500,8 @@ static void mini_suspended_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28494,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28494, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 24);
                         break;
                 }
             }
@@ -2204,18 +1516,8 @@ static void mini_suspended_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28507,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28507, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 24);
                         break;
                 }
             }
@@ -2225,18 +1527,8 @@ static void mini_suspended_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28491,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28491, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 24);
                         break;
                 }
             }
@@ -2251,18 +1543,8 @@ static void mini_suspended_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28509,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28509, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 24);
                         break;
                 }
             }
@@ -2272,18 +1554,8 @@ static void mini_suspended_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28493,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28493, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 24);
                         break;
                 }
             }
@@ -2298,18 +1570,8 @@ static void mini_suspended_rc_track_diag_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28508,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28508, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 24);
                         break;
                 }
             }
@@ -2319,18 +1581,8 @@ static void mini_suspended_rc_track_diag_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28492,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28492, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 24);
                         break;
                 }
             }
@@ -2364,11 +1616,7 @@ static void mini_suspended_rc_track_diag_flat(
 
 /** rct2: 0x008B000C */
 static void mini_suspended_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2380,18 +1628,8 @@ static void mini_suspended_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28522,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28522, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -2401,18 +1639,8 @@ static void mini_suspended_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28506,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28506, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -2427,18 +1655,8 @@ static void mini_suspended_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28519,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28519, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -2448,18 +1666,8 @@ static void mini_suspended_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28503,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28503, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -2474,18 +1682,8 @@ static void mini_suspended_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28521,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28521, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -2495,18 +1693,8 @@ static void mini_suspended_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28505,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28505, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -2521,18 +1709,8 @@ static void mini_suspended_rc_track_diag_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28520,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28520, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -2542,18 +1720,8 @@ static void mini_suspended_rc_track_diag_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28504,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28504, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -2587,11 +1755,7 @@ static void mini_suspended_rc_track_diag_25_deg_up(
 
 /** rct2: 0x008AFFEC */
 static void mini_suspended_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2603,18 +1767,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28514,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28514, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2624,18 +1778,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28498,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28498, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2650,18 +1794,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28511,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28511, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2671,18 +1805,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28495,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28495, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2697,18 +1821,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28513,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28513, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2718,18 +1832,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28497,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28497, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2744,18 +1848,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28512,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28512, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2765,18 +1859,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28496,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28496, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2810,11 +1894,7 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008AFFFC */
 static void mini_suspended_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2826,18 +1906,8 @@ static void mini_suspended_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28518,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28518, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2847,18 +1917,8 @@ static void mini_suspended_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28502,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28502, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2873,18 +1933,8 @@ static void mini_suspended_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28515,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28515, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2894,18 +1944,8 @@ static void mini_suspended_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28499,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28499, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2920,18 +1960,8 @@ static void mini_suspended_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28517,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28517, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2941,18 +1971,8 @@ static void mini_suspended_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28501,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28501, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2967,18 +1987,8 @@ static void mini_suspended_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28516,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28516, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -2988,18 +1998,8 @@ static void mini_suspended_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28500,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28500, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3033,11 +2033,7 @@ static void mini_suspended_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008B003C */
 static void mini_suspended_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3049,18 +2045,8 @@ static void mini_suspended_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28520,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28520, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -3070,18 +2056,8 @@ static void mini_suspended_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28504,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28504, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -3096,18 +2072,8 @@ static void mini_suspended_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28521,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28521, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -3117,18 +2083,8 @@ static void mini_suspended_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28505,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28505, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -3143,18 +2099,8 @@ static void mini_suspended_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28519,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28519, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -3164,18 +2110,8 @@ static void mini_suspended_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28503,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28503, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -3190,18 +2126,8 @@ static void mini_suspended_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28522,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28522, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -3211,18 +2137,8 @@ static void mini_suspended_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28506,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28506, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
             }
@@ -3256,11 +2172,7 @@ static void mini_suspended_rc_track_diag_25_deg_down(
 
 /** rct2: 0x008B001C */
 static void mini_suspended_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3272,18 +2184,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28516,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28516, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3293,18 +2195,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28500,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28500, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3318,18 +2210,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28517,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28517, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3339,18 +2221,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28501,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28501, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3364,18 +2236,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28515,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28515, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3385,18 +2247,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28499,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28499, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3410,18 +2262,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28518,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28518, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3431,18 +2273,8 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28502,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28502, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3476,11 +2308,7 @@ static void mini_suspended_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008B002C */
 static void mini_suspended_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3492,18 +2320,8 @@ static void mini_suspended_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28512,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28512, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3513,18 +2331,8 @@ static void mini_suspended_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28496,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28496, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3539,18 +2347,8 @@ static void mini_suspended_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28513,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28513, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3560,18 +2358,8 @@ static void mini_suspended_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28497,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28497, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3586,18 +2374,8 @@ static void mini_suspended_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28511,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28511, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3607,18 +2385,8 @@ static void mini_suspended_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28495,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28495, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3633,18 +2401,8 @@ static void mini_suspended_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28514,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28514, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
@@ -3654,18 +2412,8 @@ static void mini_suspended_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28498,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            1,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28498, -16, -16, 32, 32, 1, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
             }
diff --git a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp
index b857eabd12..0ee300c33c 100644
--- a/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/MultiDimensionRollerCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x00792D88 */
 static void multi_dimension_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -83,33 +79,13 @@ static void multi_dimension_rc_track_flat(
             case 0:
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26227,
-                    0,
-                    0,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26227, 0, 0, 32, 20, 1, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26228,
-                    0,
-                    0,
-                    32,
-                    20,
-                    1,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26228, 0, 0, 32, 20, 1, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -129,11 +105,7 @@ static void multi_dimension_rc_track_flat(
 
 /** rct2: 0x00792F98, 0x00792FA8, 0x00792FB8 */
 static void multi_dimension_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -148,33 +120,13 @@ static void multi_dimension_rc_track_station(
     if (track_element_get_type(tileElement) == TRACK_ELEM_END_STATION)
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            26,
-            1,
-            height,
-            0,
-            3,
+            session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 26, 1, height, 0, 3,
             height + 3);
     }
     else
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            26,
-            1,
-            height,
-            0,
-            3,
+            session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 26, 1, height, 0, 3,
             height + 3);
     }
     track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 11);
@@ -211,11 +163,7 @@ static void multi_dimension_rc_track_station(
 
 /** rct2: 0x00792D98 */
 static void multi_dimension_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -291,62 +239,22 @@ static void multi_dimension_rc_track_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26253,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26253, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26254,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26254, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26255,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26255, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26256,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26256, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 40);
                 break;
         }
@@ -390,11 +298,7 @@ static void multi_dimension_rc_track_25_deg_up(
 
 /** rct2: 0x00792DA8 */
 static void multi_dimension_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -440,62 +344,22 @@ static void multi_dimension_rc_track_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26269,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26269, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 88);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26270,
-                    0,
-                    0,
-                    32,
-                    2,
-                    81,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26270, 0, 0, 32, 2, 81, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26271,
-                    0,
-                    0,
-                    32,
-                    2,
-                    81,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26271, 0, 0, 32, 2, 81, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26272,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26272, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 88);
                 break;
         }
@@ -515,11 +379,7 @@ static void multi_dimension_rc_track_60_deg_up(
 
 /** rct2: 0x00792DB8 */
 static void multi_dimension_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -595,62 +455,22 @@ static void multi_dimension_rc_track_flat_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26245,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26245, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26246,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26246, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26247,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26247, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26248,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26248, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -694,11 +514,7 @@ static void multi_dimension_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x00792DC8 */
 static void multi_dimension_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -748,88 +564,28 @@ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26257,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26257, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26261,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26261, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26258,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26258, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26262,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26262, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26259,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26259, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26260,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26260, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
         }
@@ -849,11 +605,7 @@ static void multi_dimension_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x00792DD8 */
 static void multi_dimension_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -903,88 +655,28 @@ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26263,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26263, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26267,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26267, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26264,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26264, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26268,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 24,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26268, 0, 0, 32, 10, 49, height + 24, 0, 10,
                     height + 6);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26265,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26265, 0, 0, 32, 2, 49, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26266,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26266, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 56);
                 break;
         }
@@ -1028,11 +720,7 @@ static void multi_dimension_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x00792DE8 */
 static void multi_dimension_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -1108,62 +796,22 @@ static void multi_dimension_rc_track_25_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26249,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26249, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26250,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26250, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26251,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26251, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26252,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26252, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -1207,11 +855,7 @@ static void multi_dimension_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x00792DF8 */
 static void multi_dimension_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     multi_dimension_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1219,11 +863,7 @@ static void multi_dimension_rc_track_25_deg_down(
 
 /** rct2: 0x00792E08 */
 static void multi_dimension_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     multi_dimension_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1231,11 +871,7 @@ static void multi_dimension_rc_track_60_deg_down(
 
 /** rct2: 0x00792E18 */
 static void multi_dimension_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     multi_dimension_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1243,11 +879,7 @@ static void multi_dimension_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x00792E28 */
 static void multi_dimension_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     multi_dimension_rc_track_60_deg_up_to_25_deg_up(
@@ -1256,11 +888,7 @@ static void multi_dimension_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x00792E38 */
 static void multi_dimension_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     multi_dimension_rc_track_25_deg_up_to_60_deg_up(
@@ -1269,11 +897,7 @@ static void multi_dimension_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x00792E48 */
 static void multi_dimension_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     multi_dimension_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1281,11 +905,7 @@ static void multi_dimension_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x00792E58 */
 static void multi_dimension_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -1297,62 +917,22 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15921,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15921, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15926,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15926, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15931,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15931, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15916,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15916, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -1373,62 +953,22 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15920,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15920, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15925,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15925, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15930,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15930, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15915,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15915, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -1436,8 +976,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -1445,69 +984,27 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15919,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15919, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15924,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15924, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15929,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15929, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15914,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15914, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -1519,62 +1016,22 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15918,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15918, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15923,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15923, 0, 0, 16, 32, 3, height, 0, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15928,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15928, 0, 0, 16, 32, 3, height, 0, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15913,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15913, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                 }
@@ -1582,8 +1039,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 6:
@@ -1591,62 +1047,22 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15917,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15917, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15922,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15922, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15927,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15927, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15912,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15912, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -1662,9 +1078,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -1679,62 +1093,22 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26310,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26310, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26315,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26315, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26320,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26320, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26305,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26305, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -1742,8 +1116,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1761,71 +1134,30 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26309,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26309, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26314,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26314, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26319,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26319, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26304,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26304, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -1833,69 +1165,27 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26308,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26308, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26313,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26313, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26318,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26318, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26303,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26303, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -1907,71 +1197,30 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26307,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26307, 0, 0, 16, 32, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26312,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26312, 0, 0, 16, 32, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26317,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26317, 0, 0, 16, 32, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26302,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26302, 0, 0, 16, 32, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 6:
@@ -1979,62 +1228,22 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26306,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26306, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26311,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26311, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26316,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26316, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26301,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26301, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                 }
@@ -2042,8 +1251,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2064,11 +1272,7 @@ static void multi_dimension_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x00792E68 */
 static void multi_dimension_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2077,11 +1281,7 @@ static void multi_dimension_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x00792E78 */
 static void multi_dimension_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -2124,62 +1324,22 @@ static void multi_dimension_rc_track_flat_to_left_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26273,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26273, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26274,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26274, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26275,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26275, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26276,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26276, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -2187,8 +1347,7 @@ static void multi_dimension_rc_track_flat_to_left_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -2202,11 +1361,7 @@ static void multi_dimension_rc_track_flat_to_left_bank(
 
 /** rct2: 0x00792E88 */
 static void multi_dimension_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -2249,62 +1404,22 @@ static void multi_dimension_rc_track_flat_to_right_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26277,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26277, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26278,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26278, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26279,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26279, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26280,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26280, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -2312,8 +1427,7 @@ static void multi_dimension_rc_track_flat_to_right_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -2327,11 +1441,7 @@ static void multi_dimension_rc_track_flat_to_right_bank(
 
 /** rct2: 0x00792E98 */
 static void multi_dimension_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -2374,62 +1484,22 @@ static void multi_dimension_rc_track_left_bank_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26279,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26279, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26280,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26280, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26277,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26277, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26278,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26278, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -2437,8 +1507,7 @@ static void multi_dimension_rc_track_left_bank_to_flat(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -2452,11 +1521,7 @@ static void multi_dimension_rc_track_left_bank_to_flat(
 
 /** rct2: 0x00792EA8 */
 static void multi_dimension_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -2499,62 +1564,22 @@ static void multi_dimension_rc_track_right_bank_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26275,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26275, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26276,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26276, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26273,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26273, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26274,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26274, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -2562,8 +1587,7 @@ static void multi_dimension_rc_track_right_bank_to_flat(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -2577,11 +1601,7 @@ static void multi_dimension_rc_track_right_bank_to_flat(
 
 /** rct2: 0x00792EB8 */
 static void multi_dimension_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -2593,75 +1613,25 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15941,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15941, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15952,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15952, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15946,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15946, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15951,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15951, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15936,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15936, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -2682,62 +1652,22 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15940,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15940, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15945,
-                            0,
-                            0,
-                            32,
-                            16,
-                            1,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15945, 0, 0, 32, 16, 1, height, 0, 0,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15950,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15950, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15935,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15935, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -2745,8 +1675,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -2754,69 +1683,27 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15939,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15939, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15944,
-                            0,
-                            0,
-                            16,
-                            16,
-                            1,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15944, 0, 0, 16, 16, 1, height, 16, 16,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15949,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15949, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15934,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15934, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -2828,62 +1715,22 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15938,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15938, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15943,
-                            0,
-                            0,
-                            16,
-                            32,
-                            1,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15943, 0, 0, 16, 32, 1, height, 0, 0,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15948,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15948, 0, 0, 16, 32, 3, height, 0, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15933,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15933, 0, 0, 16, 32, 3, height, 16, 0,
                             height);
                         break;
                 }
@@ -2891,8 +1738,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 6:
@@ -2900,75 +1746,25 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15937,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15937, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15942,
-                            0,
-                            0,
-                            1,
-                            32,
-                            26,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15942, 0, 0, 1, 32, 26, height, 27, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15947,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15947, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15953,
-                            0,
-                            0,
-                            1,
-                            32,
-                            26,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15953, 0, 0, 1, 32, 26, height, 27, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15932,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15932, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -2984,9 +1780,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -3001,62 +1795,22 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26354,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26354, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26359,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26359, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 24);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26364,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26364, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 24);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26349,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26349, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 24);
                         break;
                 }
@@ -3064,8 +1818,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3091,41 +1844,20 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26363,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26363, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 24);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26348,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26348, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 24);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
@@ -3133,48 +1865,18 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26352,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26352, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26357,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26357, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 24);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26362,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26362, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 24);
                         break;
                     case 3:
                         sub_98196C_rotated(
@@ -3182,9 +1884,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -3196,18 +1896,8 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26351,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26351, 0, 0, 16, 32, 3, height + 24, 16,
+                            0, height + 24);
                         break;
                     case 1:
                         sub_98196C_rotated(
@@ -3219,26 +1909,15 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26346,
-                            0,
-                            0,
-                            16,
-                            32,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26346, 0, 0, 16, 32, 3, height + 24, 16,
+                            0, height + 24);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 6:
@@ -3246,62 +1925,22 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26350,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26350, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26355,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26355, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 24);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26360,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26360, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 24);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26345,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26345, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 24);
                         break;
                 }
@@ -3309,8 +1948,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3331,11 +1969,7 @@ static void multi_dimension_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x00792EC8 */
 static void multi_dimension_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -3345,11 +1979,7 @@ static void multi_dimension_rc_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x00792ED8 */
 static void multi_dimension_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -3399,62 +2029,22 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26281,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26281, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26282,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26282, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26283,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26283, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26284,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26284, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -3462,8 +2052,7 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             switch (direction)
@@ -3501,11 +2090,7 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x00792EE8 */
 static void multi_dimension_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -3555,62 +2140,22 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26285,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26285, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26286,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26286, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26287,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26287, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26288,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26288, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -3618,8 +2163,7 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             switch (direction)
@@ -3657,11 +2201,7 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x00792EF8 */
 static void multi_dimension_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -3711,62 +2251,22 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26289,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26289, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26290,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26290, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26291,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26291, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26292,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26292, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -3774,8 +2274,7 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             switch (direction)
@@ -3813,11 +2312,7 @@ static void multi_dimension_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x00792F08 */
 static void multi_dimension_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -3867,62 +2362,22 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26293,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26293, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26294,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26294, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26295,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26295, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26296,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26296, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 32);
                 break;
         }
@@ -3930,8 +2385,7 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             switch (direction)
@@ -3969,11 +2423,7 @@ static void multi_dimension_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x00792F18 */
 static void multi_dimension_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     multi_dimension_rc_track_25_deg_up_to_right_bank(
@@ -3982,11 +2432,7 @@ static void multi_dimension_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x00792F28 */
 static void multi_dimension_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     multi_dimension_rc_track_25_deg_up_to_left_bank(
@@ -3995,11 +2441,7 @@ static void multi_dimension_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x00792F38 */
 static void multi_dimension_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     multi_dimension_rc_track_right_bank_to_25_deg_up(
@@ -4008,11 +2450,7 @@ static void multi_dimension_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x00792F48 */
 static void multi_dimension_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     multi_dimension_rc_track_left_bank_to_25_deg_up(
@@ -4021,11 +2459,7 @@ static void multi_dimension_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x00792F58 */
 static void multi_dimension_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -4064,62 +2498,22 @@ static void multi_dimension_rc_track_left_bank(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26297,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26297, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26298,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26298, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26299,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26299, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26300,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26300, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 22);
                 break;
         }
@@ -4127,8 +2521,7 @@ static void multi_dimension_rc_track_left_bank(
         paint_util_set_segment_support_height(
             session,
             paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-            0xFFFF,
-            0);
+            0xFFFF, 0);
         if (track_paint_util_should_paint_supports(session->MapPosition))
         {
             metal_a_supports_paint_setup(
@@ -4142,11 +2535,7 @@ static void multi_dimension_rc_track_left_bank(
 
 /** rct2: 0x00792F68 */
 static void multi_dimension_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     multi_dimension_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -4154,11 +2543,7 @@ static void multi_dimension_rc_track_right_bank(
 
 /** rct2: 0x00792F78 */
 static void multi_dimension_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -4170,62 +2555,22 @@ static void multi_dimension_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15816,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15816, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15820,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15820, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15819,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15819, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15823,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15823, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -4255,32 +2600,12 @@ static void multi_dimension_rc_track_s_bend_left(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15818,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15818, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15822,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15822, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -4292,32 +2617,12 @@ static void multi_dimension_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15818,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15818, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15822,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15822, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
@@ -4341,62 +2646,22 @@ static void multi_dimension_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15819,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15819, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15823,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15823, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15816,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15816, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15820,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15820, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -4425,70 +2690,28 @@ static void multi_dimension_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26229,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26229, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26233,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26233, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26232,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26232, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26236,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26236, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4504,62 +2727,22 @@ static void multi_dimension_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26230,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26230, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26234,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26234, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26231,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26231, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26235,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26235, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -4568,8 +2751,7 @@ static void multi_dimension_rc_track_s_bend_left(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -4589,62 +2771,22 @@ static void multi_dimension_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26231,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26231, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26235,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26235, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26230,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26230, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26234,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26234, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
@@ -4653,8 +2795,7 @@ static void multi_dimension_rc_track_s_bend_left(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 2:
@@ -4674,70 +2815,28 @@ static void multi_dimension_rc_track_s_bend_left(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26232,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26232, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26236,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26236, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26229,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26229, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26233,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26233, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4759,11 +2858,7 @@ static void multi_dimension_rc_track_s_bend_left(
 
 /** rct2: 0x00792F88 */
 static void multi_dimension_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -4775,62 +2870,22 @@ static void multi_dimension_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15824,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15824, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15828,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15828, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15827,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15827, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15831,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15831, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -4848,34 +2903,14 @@ static void multi_dimension_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15825,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15825, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15829,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15829, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4905,34 +2940,14 @@ static void multi_dimension_rc_track_s_bend_right(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15825,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15825, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15829,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15829, 0, 0, 32, 26, 3, height, 0, 6,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -4946,62 +2961,22 @@ static void multi_dimension_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15827,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15827, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15831,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15831, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15824,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15824, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15828,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15828, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -5030,70 +3005,28 @@ static void multi_dimension_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26237,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26237, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26241,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26241, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26240,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26240, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26244,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26244, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5109,62 +3042,22 @@ static void multi_dimension_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26238,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26238, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26242,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26242, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26239,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26239, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26243,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26243, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
@@ -5173,8 +3066,7 @@ static void multi_dimension_rc_track_s_bend_right(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -5194,62 +3086,22 @@ static void multi_dimension_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26239,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26239, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26243,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26243, 0, 0, 32, 26, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26238,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26238, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26242,
-                            0,
-                            0,
-                            32,
-                            26,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26242, 0, 0, 32, 26, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -5258,8 +3110,7 @@ static void multi_dimension_rc_track_s_bend_right(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 2:
@@ -5279,70 +3130,28 @@ static void multi_dimension_rc_track_s_bend_right(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26240,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26240, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26244,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26244, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26237,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26237, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26241,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26241, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
@@ -5364,11 +3173,7 @@ static void multi_dimension_rc_track_s_bend_right(
 
 /** rct2: 0x00792FC8 */
 static void multi_dimension_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -5380,62 +3185,22 @@ static void multi_dimension_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15959,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15959, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15962,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15962, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15965,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15965, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15956,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15956, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -5456,69 +3221,27 @@ static void multi_dimension_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15958,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15958, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15961,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15961, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15964,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15964, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15955,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15955, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -5527,62 +3250,22 @@ static void multi_dimension_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15957,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15957, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15960,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15960, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15963,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15963, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15954,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15954, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -5598,9 +3281,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -5615,62 +3296,22 @@ static void multi_dimension_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26326,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26326, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26329,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26329, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26332,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26332, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26323,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26323, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -5678,8 +3319,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5697,69 +3337,27 @@ static void multi_dimension_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26325,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26325, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26328,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26328, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26331,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26331, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26322,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26322, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -5768,62 +3366,22 @@ static void multi_dimension_rc_track_left_quarter_turn_3(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26324,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26324, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26327,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26327, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26330,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26330, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26321,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26321, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                 }
@@ -5831,8 +3389,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -5853,11 +3410,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x00792FD8 */
 static void multi_dimension_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -5866,11 +3419,7 @@ static void multi_dimension_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x00792FE8 */
 static void multi_dimension_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -5882,75 +3431,25 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15971,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15971, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15978,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15978, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15974,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15974, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15977,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15977, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15968,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15968, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -5971,69 +3470,27 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15970,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15970, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15973,
-                            0,
-                            0,
-                            16,
-                            16,
-                            1,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15973, 0, 0, 16, 16, 1, height, 0, 0,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15976,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15976, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15967,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15967, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -6042,75 +3499,25 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15969,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15969, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15972,
-                            0,
-                            0,
-                            1,
-                            32,
-                            26,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15972, 0, 0, 1, 32, 26, height, 27, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15975,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15975, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15979,
-                            0,
-                            0,
-                            1,
-                            32,
-                            26,
-                            height,
-                            27,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15979, 0, 0, 1, 32, 26, height, 27, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15966,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15966, 0, 0, 20, 32, 3, height, 6, 0,
                             height);
                         break;
                 }
@@ -6126,9 +3533,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -6143,62 +3548,22 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26338,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26338, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26341,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26341, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26344,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26344, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26335,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26335, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -6206,8 +3571,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -6225,69 +3589,27 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26337,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26337, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26340,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26340, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26343,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26343, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26334,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26334, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -6296,62 +3618,22 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26336,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26336, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26339,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26339, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26342,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26342, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26333,
-                            0,
-                            0,
-                            20,
-                            32,
-                            3,
-                            height + 24,
-                            6,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26333, 0, 0, 20, 32, 3, height + 24, 6, 0,
                             height + 22);
                         break;
                 }
@@ -6359,8 +3641,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -6381,11 +3662,7 @@ static void multi_dimension_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x00792FF8 */
 static void multi_dimension_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -6395,11 +3672,7 @@ static void multi_dimension_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x00793008 */
 static void multi_dimension_rc_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6411,32 +3684,12 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16197, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16204,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16204, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16200,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16200, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -6465,62 +3718,22 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16196,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16196, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16199,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16199, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16202,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16202, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16193,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16193, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -6537,34 +3750,14 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16198,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16198, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16201, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16205,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16205, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -6584,10 +3777,8 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -6601,32 +3792,12 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16197, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16204,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16204, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16200,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16200, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -6656,62 +3827,22 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16193,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16193, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16196,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16196, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16199,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16199, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16202,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16202, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -6732,34 +3863,14 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16198,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16198, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16201, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16205,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16205, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -6777,11 +3888,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_small(
 
 /** rct2: 0x00793018 */
 static void multi_dimension_rc_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6799,34 +3906,14 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16184,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16184, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16187, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16191,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16191, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -6847,62 +3934,22 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16179,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16179, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16182,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16182, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16185,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16185, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16188,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16188, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -6921,32 +3968,12 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16183, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16190,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16190, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16186,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16186, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -6977,34 +4004,14 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16184,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16184, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16187, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16191,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16191, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -7024,10 +4031,8 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -7038,62 +4043,22 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16182,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16182, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16185,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16185, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16188,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16188, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16179,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16179, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -7108,32 +4073,12 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16183, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16190,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16190, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16186,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16186, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -7159,11 +4104,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_small(
 
 /** rct2: 0x00793028 */
 static void multi_dimension_rc_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -7178,11 +4119,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_down_small(
 
 /** rct2: 0x00793038 */
 static void multi_dimension_rc_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -7197,11 +4134,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_down_small(
 
 /** rct2: 0x00793048 */
 static void multi_dimension_rc_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7213,32 +4146,12 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16165, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16176,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16176, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16170,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16170, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -7271,47 +4184,17 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16169,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16169, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16174,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16174, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16159,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16159, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -7319,8 +4202,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -7328,47 +4210,17 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16163,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16163, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16168,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16168, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16173,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16173, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -7388,32 +4240,12 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16162,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16162, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16167,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16167, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -7422,17 +4254,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16157,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16157, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -7440,8 +4262,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -7453,34 +4274,14 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16166,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16166, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16171, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16177,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16177, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -7500,10 +4301,8 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -7517,32 +4316,12 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16165, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16176,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16176, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16170,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16170, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -7572,17 +4351,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16159,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16159, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -7591,32 +4360,12 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16169,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16169, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16174,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16174, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -7624,8 +4373,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -7637,47 +4385,17 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16163,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16163, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16168,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16168, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16173,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16173, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -7693,47 +4411,17 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16157,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16157, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16162,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16162, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16167,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16167, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -7745,8 +4433,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -7762,34 +4449,14 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16166,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16166, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16171, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16177,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16177, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -7807,11 +4474,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_up_large(
 
 /** rct2: 0x00793058 */
 static void multi_dimension_rc_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7829,34 +4492,14 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16144,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16144, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16149, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16155,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16155, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -7877,47 +4520,17 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16135,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16135, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16140,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16140, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16145,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16145, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -7929,8 +4542,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -7942,47 +4554,17 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16141,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16141, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16146,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16146, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16151,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16151, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -7998,17 +4580,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16137,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16137, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -8017,32 +4589,12 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16147,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16147, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16152,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16152, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -8050,8 +4602,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -8065,32 +4616,12 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16143, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16154,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16154, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16148,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16148, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -8121,34 +4652,14 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16144,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16144, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16149, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16155,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16155, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -8168,10 +4679,8 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -8182,32 +4691,12 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16140,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16140, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16145,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16145, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -8216,17 +4705,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16135,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16135, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -8234,8 +4713,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -8243,47 +4721,17 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16141,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16141, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16146,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16146, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16151,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16151, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -8307,47 +4755,17 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16147,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16147, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16152,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16152, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16137,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16137, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -8355,8 +4773,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -8366,32 +4783,12 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 16143, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16154,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16154, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16148,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16148, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -8417,11 +4814,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_up_large(
 
 /** rct2: 0x00793068 */
 static void multi_dimension_rc_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -8436,11 +4829,7 @@ static void multi_dimension_rc_track_left_half_banked_helix_down_large(
 
 /** rct2: 0x00793078 */
 static void multi_dimension_rc_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -8455,11 +4844,7 @@ static void multi_dimension_rc_track_right_half_banked_helix_down_large(
 
 /** rct2: 0x00793088 */
 static void multi_dimension_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -8493,33 +4878,13 @@ static void multi_dimension_rc_track_brakes(
             case 0:
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26549,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26549, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 1:
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26550,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26550, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
         }
@@ -8539,11 +4904,7 @@ static void multi_dimension_rc_track_brakes(
 
 /** rct2: 0x00793098 */
 static void multi_dimension_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -8603,17 +4964,7 @@ static void multi_dimension_rc_track_on_ride_photo(
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26227,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26227, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 1:
@@ -8623,17 +4974,7 @@ static void multi_dimension_rc_track_on_ride_photo(
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26228,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26228, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 2:
@@ -8643,17 +4984,7 @@ static void multi_dimension_rc_track_on_ride_photo(
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 8, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26227,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26227, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 3:
@@ -8663,17 +4994,7 @@ static void multi_dimension_rc_track_on_ride_photo(
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 7, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26228,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26228, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
         }
@@ -8686,11 +5007,7 @@ static void multi_dimension_rc_track_on_ride_photo(
 
 /** rct2: 0x00793328 */
 static void multi_dimension_rc_track_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -8702,62 +5019,22 @@ static void multi_dimension_rc_track_90_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16130,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            4,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16130, 0, 0, 2, 20, 31, height, 4, 6,
                             height + 8);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16131,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16131, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16132,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16132, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16133,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            4,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16133, 0, 0, 2, 20, 31, height, 4, 6,
                             height + 8);
                         break;
                 }
@@ -8779,62 +5056,22 @@ static void multi_dimension_rc_track_90_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26533,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26533, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 56);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26534,
-                            0,
-                            0,
-                            32,
-                            2,
-                            31,
-                            height + 24,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26534, 0, 0, 32, 2, 31, height + 24, 0, 4,
                             height + 6);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26535,
-                            0,
-                            0,
-                            32,
-                            2,
-                            31,
-                            height + 24,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26535, 0, 0, 32, 2, 31, height + 24, 0, 4,
                             height + 6);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26536,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26536, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 56);
                         break;
                 }
@@ -8851,11 +5088,7 @@ static void multi_dimension_rc_track_90_deg_up(
 
 /** rct2: 0x00793338 */
 static void multi_dimension_rc_track_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     multi_dimension_rc_track_90_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -8863,11 +5096,7 @@ static void multi_dimension_rc_track_90_deg_down(
 
 /** rct2: 0x00793348 */
 static void multi_dimension_rc_track_60_deg_up_to_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -8879,62 +5108,22 @@ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16122,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16122, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16123,
-                            0,
-                            0,
-                            2,
-                            20,
-                            55,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16123, 0, 0, 2, 20, 55, height, 24, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16124,
-                            0,
-                            0,
-                            2,
-                            20,
-                            55,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16124, 0, 0, 2, 20, 55, height, 24, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16125,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16125, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -8960,62 +5149,22 @@ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26525,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26525, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 80);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26526,
-                            0,
-                            0,
-                            32,
-                            2,
-                            55,
-                            height + 24,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26526, 0, 0, 32, 2, 55, height + 24, 0, 4,
                             height + 6);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26527,
-                            0,
-                            0,
-                            32,
-                            2,
-                            55,
-                            height + 24,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26527, 0, 0, 32, 2, 55, height + 24, 0, 4,
                             height + 6);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26528,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26528, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 80);
                         break;
                 }
@@ -9036,11 +5185,7 @@ static void multi_dimension_rc_track_60_deg_up_to_90_deg_up(
 
 /** rct2: 0x00793358 */
 static void multi_dimension_rc_track_90_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     multi_dimension_rc_track_60_deg_up_to_90_deg_up(
@@ -9049,11 +5194,7 @@ static void multi_dimension_rc_track_90_deg_down_to_60_deg_down(
 
 /** rct2: 0x00793368 */
 static void multi_dimension_rc_track_90_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -9066,32 +5207,12 @@ static void multi_dimension_rc_track_90_deg_up_to_60_deg_up(
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 16127,
-                    0,
-                    0,
-                    2,
-                    20,
-                    31,
-                    height,
-                    39,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 16127, 0, 0, 2, 20, 31, height, 39, 6,
                     height + 8);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 16128,
-                    0,
-                    0,
-                    2,
-                    20,
-                    31,
-                    height,
-                    39,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 16128, 0, 0, 2, 20, 31, height, 39, 6,
                     height + 8);
                 break;
             case 3:
@@ -9118,62 +5239,22 @@ static void multi_dimension_rc_track_90_deg_up_to_60_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26529,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26529, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 80);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26530,
-                    0,
-                    0,
-                    32,
-                    2,
-                    55,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26530, 0, 0, 32, 2, 55, height + 24, 0, 4,
                     height + 6);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26531,
-                    0,
-                    0,
-                    32,
-                    2,
-                    55,
-                    height + 24,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26531, 0, 0, 32, 2, 55, height + 24, 0, 4,
                     height + 6);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26532,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26532, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 80);
                 break;
         }
@@ -9194,11 +5275,7 @@ static void multi_dimension_rc_track_90_deg_up_to_60_deg_up(
 
 /** rct2: 0x00793378 */
 static void multi_dimension_rc_track_60_deg_down_to_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -9210,62 +5287,22 @@ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16128,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            39,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16128, 0, 0, 2, 20, 31, height, 39, 6,
                             height + 8);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16129,
-                            0,
-                            0,
-                            6,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16129, 0, 0, 6, 20, 3, height, 0, 6,
                             height + 2);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16126,
-                            0,
-                            0,
-                            6,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16126, 0, 0, 6, 20, 3, height, 0, 6,
                             height + 2);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16127,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            39,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16127, 0, 0, 2, 20, 31, height, 39, 6,
                             height + 8);
                         break;
                 }
@@ -9290,62 +5327,22 @@ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26531,
-                            0,
-                            0,
-                            32,
-                            2,
-                            55,
-                            height + 24,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26531, 0, 0, 32, 2, 55, height + 24, 0, 4,
                             height + 6);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26532,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26532, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 80);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26529,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26529, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 80);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26530,
-                            0,
-                            0,
-                            32,
-                            2,
-                            55,
-                            height + 24,
-                            0,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26530, 0, 0, 32, 2, 55, height + 24, 0, 4,
                             height + 6);
                         break;
                 }
@@ -9365,11 +5362,7 @@ static void multi_dimension_rc_track_60_deg_down_to_90_deg_down(
 
 /** rct2: 0x007930B8 */
 static void multi_dimension_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -9381,62 +5374,22 @@ static void multi_dimension_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15996,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15996, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16000,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16000, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16004,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16004, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16008,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16008, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -9454,62 +5407,22 @@ static void multi_dimension_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15997,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15997, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16001,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16001, 0, 0, 34, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16005,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16005, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16009,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16009, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -9521,77 +5434,34 @@ static void multi_dimension_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15998,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15998, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16002,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16002, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16006,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16006, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16010,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16010, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -9600,68 +5470,28 @@ static void multi_dimension_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15999,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15999, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16003,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16003, 0, 0, 16, 18, 3, height, 0, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16007,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16007, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16011,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16011, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -9681,62 +5511,22 @@ static void multi_dimension_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26405,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26405, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26409,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26409, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26413,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26413, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26417,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26417, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -9757,71 +5547,30 @@ static void multi_dimension_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26406,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26406, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26410,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26410, 0, 0, 34, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26414,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26414, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26418,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26418, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -9829,77 +5578,34 @@ static void multi_dimension_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26407,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26407, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26411,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26411, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26415,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26415, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26419,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26419, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -9908,63 +5614,23 @@ static void multi_dimension_rc_track_left_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26408,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26408, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26412,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26412, 0, 0, 16, 18, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26416,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26416, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26420,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26420, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                 }
 
@@ -9972,8 +5638,7 @@ static void multi_dimension_rc_track_left_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -10002,11 +5667,7 @@ static void multi_dimension_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x007930C8 */
 static void multi_dimension_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -10018,62 +5679,22 @@ static void multi_dimension_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15980,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15980, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15984,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15984, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15988,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15988, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15992,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15992, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -10091,62 +5712,22 @@ static void multi_dimension_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15981,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15981, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15985,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15985, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15989,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15989, 0, 0, 34, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15993,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15993, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
@@ -10158,77 +5739,34 @@ static void multi_dimension_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15982,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15982, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15986,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15986, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15990,
-                            0,
-                            0,
-                            28,
-                            28,
-                            3,
-                            height,
-                            4,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15990, 0, 0, 28, 28, 3, height, 4, 4,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15994,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15994, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -10237,68 +5775,28 @@ static void multi_dimension_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15983,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15983, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15987,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15987, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15991,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15991, 0, 0, 16, 18, 3, height, 0, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 15995,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 15995, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10318,62 +5816,22 @@ static void multi_dimension_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26389,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26389, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26393,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26393, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26397,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26397, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26401,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26401, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
@@ -10394,62 +5852,22 @@ static void multi_dimension_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26390,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26390, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26394,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26394, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26398,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26398, 0, 0, 34, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26402,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26402, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
@@ -10457,8 +5875,7 @@ static void multi_dimension_rc_track_right_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -10466,77 +5883,34 @@ static void multi_dimension_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26391,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26391, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26395,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26395, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26399,
-                            0,
-                            0,
-                            28,
-                            28,
-                            3,
-                            height + 24,
-                            4,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26399, 0, 0, 28, 28, 3, height + 24, 4, 4,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26403,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26403, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -10545,63 +5919,23 @@ static void multi_dimension_rc_track_right_eighth_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26392,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26392, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26396,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26396, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26400,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26400, 0, 0, 16, 18, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26404,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26404, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                 }
 
@@ -10609,8 +5943,7 @@ static void multi_dimension_rc_track_right_eighth_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -10639,11 +5972,7 @@ static void multi_dimension_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x007930D8 */
 static void multi_dimension_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -10652,11 +5981,7 @@ static void multi_dimension_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x007930E8 */
 static void multi_dimension_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -10665,11 +5990,7 @@ static void multi_dimension_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x007930F8 */
 static void multi_dimension_rc_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -10681,62 +6002,22 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16028,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16028, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16032,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16032, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16036,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16036, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16040,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16040, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                 }
@@ -10754,62 +6035,22 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16029,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16029, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16033,
-                            0,
-                            0,
-                            34,
-                            16,
-                            0,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16033, 0, 0, 34, 16, 0, height, 0, 0,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16037,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16037, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16041,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16041, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
@@ -10821,77 +6062,34 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16030,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16030, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16034,
-                            0,
-                            0,
-                            16,
-                            16,
-                            0,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16034, 0, 0, 16, 16, 0, height, 16, 16,
                             height + 27);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16038,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16038, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16042,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16042, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -10900,68 +6098,28 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16031,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16031, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16035,
-                            0,
-                            0,
-                            16,
-                            18,
-                            0,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16035, 0, 0, 16, 18, 0, height, 0, 16,
                             height + 27);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16039,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16039, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16043,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16043, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10981,70 +6139,28 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26437,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26437, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26441,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26441, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26445,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26445, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26449,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26449, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11060,71 +6176,30 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26438,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26438, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26442,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26442, 0, 0, 34, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26446,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26446, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26450,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26450, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -11132,77 +6207,34 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26439,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26439, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26443,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26443, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26447,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26447, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26451,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26451, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -11211,63 +6243,23 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26440,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26440, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26444,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26444, 0, 0, 16, 18, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26448,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26448, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26452,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26452, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                 }
 
@@ -11275,8 +6267,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -11305,11 +6296,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x00793108 */
 static void multi_dimension_rc_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -11321,62 +6308,22 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16012,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16012, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16016,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16016, 0, 0, 32, 20, 3, height, 0, 6,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16020,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16020, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16024,
-                            0,
-                            0,
-                            32,
-                            1,
-                            26,
-                            height,
-                            0,
-                            27,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16024, 0, 0, 32, 1, 26, height, 0, 27,
                             height);
                         break;
                 }
@@ -11394,62 +6341,22 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16013,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16013, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16017,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16017, 0, 0, 32, 16, 3, height, 0, 16,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16021,
-                            0,
-                            0,
-                            34,
-                            16,
-                            0,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16021, 0, 0, 34, 16, 0, height, 0, 0,
                             height + 27);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16025,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16025, 0, 0, 32, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
@@ -11461,77 +6368,34 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16014,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16014, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16018,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16018, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16022,
-                            0,
-                            0,
-                            28,
-                            28,
-                            0,
-                            height,
-                            4,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16022, 0, 0, 28, 28, 0, height, 4, 4,
                             height + 27);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16026,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16026, 0, 0, 16, 16, 3, height, 0, 16,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -11540,68 +6404,28 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16015,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16015, 0, 0, 16, 16, 3, height, 16, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16019,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16019, 0, 0, 16, 16, 3, height, 0, 0,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16023,
-                            0,
-                            0,
-                            16,
-                            18,
-                            0,
-                            height,
-                            0,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16023, 0, 0, 16, 18, 0, height, 0, 16,
                             height + 27);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16027,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height,
-                            16,
-                            16,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16027, 0, 0, 16, 16, 3, height, 16, 16,
                             height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11621,70 +6445,28 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26421,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26421, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26425,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26425, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26429,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26429, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26433,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 24,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26433, 0, 0, 32, 20, 3, height + 24, 0, 6,
                             height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 metal_a_supports_paint_setup(
                     session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11700,62 +6482,22 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26422,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26422, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26426,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26426, 0, 0, 32, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26430,
-                            0,
-                            0,
-                            34,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26430, 0, 0, 34, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26434,
-                            0,
-                            0,
-                            32,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26434, 0, 0, 32, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                 }
@@ -11763,8 +6505,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 2:
@@ -11772,77 +6513,34 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26423,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26423, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26427,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26427, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26431,
-                            0,
-                            0,
-                            28,
-                            28,
-                            3,
-                            height + 24,
-                            4,
-                            4,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26431, 0, 0, 28, 28, 3, height + 24, 4, 4,
                             height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26435,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26435, 0, 0, 16, 16, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
             case 3:
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -11851,63 +6549,23 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26424,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            0,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26424, 0, 0, 16, 16, 3, height + 24, 16,
+                            0, height + 22);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26428,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26428, 0, 0, 16, 16, 3, height + 24, 0, 0,
                             height + 22);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26432,
-                            0,
-                            0,
-                            16,
-                            18,
-                            3,
-                            height + 24,
-                            0,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26432, 0, 0, 16, 18, 3, height + 24, 0,
+                            16, height + 22);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26436,
-                            0,
-                            0,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            16,
-                            16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26436, 0, 0, 16, 16, 3, height + 24, 16,
+                            16, height + 22);
                         break;
                 }
 
@@ -11915,8 +6573,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(
                     session,
                     paint_util_rotate_segments(
                         SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -11945,11 +6602,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x00793118 */
 static void multi_dimension_rc_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -11959,11 +6612,7 @@ static void multi_dimension_rc_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x00793128 */
 static void multi_dimension_rc_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -11973,11 +6622,7 @@ static void multi_dimension_rc_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x007930A8 */
 static void multi_dimension_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -11991,18 +6636,8 @@ static void multi_dimension_rc_track_diag_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16109,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16109, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -12012,25 +6647,13 @@ static void multi_dimension_rc_track_diag_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16047,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16047, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -12041,18 +6664,8 @@ static void multi_dimension_rc_track_diag_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16106,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16106, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -12062,25 +6675,13 @@ static void multi_dimension_rc_track_diag_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16044,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16044, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -12091,18 +6692,8 @@ static void multi_dimension_rc_track_diag_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16108,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16108, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -12112,25 +6703,13 @@ static void multi_dimension_rc_track_diag_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16046,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16046, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -12145,18 +6724,8 @@ static void multi_dimension_rc_track_diag_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16107,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16107, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_a_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -12180,18 +6749,8 @@ static void multi_dimension_rc_track_diag_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16045,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16045, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_a_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -12206,9 +6765,7 @@ static void multi_dimension_rc_track_diag_flat(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -12225,18 +6782,8 @@ static void multi_dimension_rc_track_diag_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26484,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26484, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
@@ -12246,25 +6793,13 @@ static void multi_dimension_rc_track_diag_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26456,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26456, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -12275,18 +6810,8 @@ static void multi_dimension_rc_track_diag_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26481,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26481, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
@@ -12296,25 +6821,13 @@ static void multi_dimension_rc_track_diag_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26453,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26453, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -12325,18 +6838,8 @@ static void multi_dimension_rc_track_diag_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26483,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26483, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
@@ -12346,25 +6849,13 @@ static void multi_dimension_rc_track_diag_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26455,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26455, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -12375,18 +6866,8 @@ static void multi_dimension_rc_track_diag_flat(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26482,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26482, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
@@ -12396,26 +6877,14 @@ static void multi_dimension_rc_track_diag_flat(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26454,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 22);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26454, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 22);
                             break;
                     }
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -12445,11 +6914,7 @@ static void multi_dimension_rc_track_diag_flat(
 
 /** rct2: 0x00793158 */
 static void multi_dimension_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -12463,18 +6928,8 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16121,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16121, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -12484,25 +6939,13 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16059,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16059, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -12513,18 +6956,8 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16118,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16118, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -12534,25 +6967,13 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16056,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16056, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -12563,18 +6984,8 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16120,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16120, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -12584,25 +6995,13 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16058,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16058, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -12617,18 +7016,8 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16119,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16119, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -12652,18 +7041,8 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16057,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16057, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -12678,9 +7057,7 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -12697,18 +7074,8 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26496,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26496, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
@@ -12718,25 +7085,13 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26468,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26468, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -12747,18 +7102,8 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26493,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26493, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
@@ -12768,25 +7113,13 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26465,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26465, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -12797,18 +7130,8 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26495,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26495, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
@@ -12818,25 +7141,13 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26467,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26467, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -12847,18 +7158,8 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26494,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26494, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
@@ -12868,26 +7169,14 @@ static void multi_dimension_rc_track_diag_25_deg_up(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26466,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 40);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26466, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 40);
                             break;
                     }
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -12917,11 +7206,7 @@ static void multi_dimension_rc_track_diag_25_deg_up(
 
 /** rct2: 0x007931B8 */
 static void multi_dimension_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -12933,24 +7218,12 @@ static void multi_dimension_rc_track_diag_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16071,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16071, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -12959,24 +7232,12 @@ static void multi_dimension_rc_track_diag_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16068,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16068, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -12985,24 +7246,12 @@ static void multi_dimension_rc_track_diag_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16070,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16070, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -13015,18 +7264,8 @@ static void multi_dimension_rc_track_diag_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16069,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16069, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 36, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -13040,9 +7279,7 @@ static void multi_dimension_rc_track_diag_60_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -13057,24 +7294,12 @@ static void multi_dimension_rc_track_diag_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26480,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26480, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -13083,24 +7308,12 @@ static void multi_dimension_rc_track_diag_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26477,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26477, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -13109,24 +7322,12 @@ static void multi_dimension_rc_track_diag_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26479,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26479, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -13135,25 +7336,13 @@ static void multi_dimension_rc_track_diag_60_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26478,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26478, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 24);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -13183,11 +7372,7 @@ static void multi_dimension_rc_track_diag_60_deg_up(
 
 /** rct2: 0x00793138 */
 static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -13201,18 +7386,8 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16113,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16113, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -13222,25 +7397,13 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16051,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16051, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -13251,18 +7414,8 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16110,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16110, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -13272,25 +7425,13 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16048,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16048, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -13301,18 +7442,8 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16112,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16112, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -13322,25 +7453,13 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16050,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16050, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -13355,18 +7474,8 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16111,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16111, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -13390,18 +7499,8 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16049,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16049, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -13416,9 +7515,7 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -13435,18 +7532,8 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26488,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26488, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -13456,25 +7543,13 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26460,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26460, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -13485,18 +7560,8 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26485,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26485, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -13506,25 +7571,13 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26457,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26457, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -13535,18 +7588,8 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26487,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26487, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -13556,25 +7599,13 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26459,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26459, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -13585,18 +7616,8 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26486,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26486, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -13606,26 +7627,14 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26458,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26458, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -13655,11 +7664,7 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x00793198 */
 static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -13671,24 +7676,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16063,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16063, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -13697,24 +7690,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16060,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16060, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -13723,24 +7704,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16062,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16062, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -13753,18 +7722,8 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16061,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16061, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -13778,9 +7737,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -13795,24 +7752,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26472,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26472, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -13821,24 +7766,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26469,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26469, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -13847,24 +7780,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26471,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26471, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -13873,25 +7794,13 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26470,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26470, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -13921,11 +7830,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x007931A8 */
 static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -13937,24 +7842,12 @@ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16067,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16067, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -13963,24 +7856,12 @@ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16064,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16064, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -13989,24 +7870,12 @@ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16066,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16066, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -14019,17 +7888,7 @@ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16065,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16065, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 21, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -14044,9 +7903,7 @@ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -14061,24 +7918,12 @@ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26476,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26476, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -14087,24 +7932,12 @@ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26473,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26473, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -14113,24 +7946,12 @@ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26475,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26475, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -14139,25 +7960,13 @@ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26474,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26474, -16, -16, 16, 16, 3, height + 24,
+                            0, 0, height + 56);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -14187,11 +7996,7 @@ static void multi_dimension_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x00793148 */
 static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -14205,18 +8010,8 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16117,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16117, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -14226,25 +8021,13 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16055,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16055, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14255,18 +8038,8 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16114,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16114, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -14276,25 +8049,13 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16052,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16052, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14305,18 +8066,8 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16116,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16116, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -14326,25 +8077,13 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16054,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16054, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14359,18 +8098,8 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16115,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16115, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -14394,18 +8123,8 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16053,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16053, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -14420,9 +8139,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14439,18 +8156,8 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26492,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26492, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -14460,25 +8167,13 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26464,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26464, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14489,18 +8184,8 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26489,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26489, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -14510,25 +8195,13 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26461,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26461, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14539,18 +8212,8 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26491,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26491, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -14560,25 +8223,13 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26463,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26463, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14589,18 +8240,8 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26490,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26490, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
@@ -14610,26 +8251,14 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
                     {
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 26462,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height + 24,
-                                -16,
-                                -16,
-                                height + 32);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 26462, -16, -16, 32, 32, 3,
+                                height + 24, -16, -16, height + 32);
                             break;
                     }
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -14659,11 +8288,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x00793188 */
 static void multi_dimension_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -14677,18 +8302,8 @@ static void multi_dimension_rc_track_diag_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16119,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16119, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -14698,25 +8313,13 @@ static void multi_dimension_rc_track_diag_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16057,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16057, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14727,18 +8330,8 @@ static void multi_dimension_rc_track_diag_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16120,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16120, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -14748,25 +8341,13 @@ static void multi_dimension_rc_track_diag_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16058,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16058, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14777,18 +8358,8 @@ static void multi_dimension_rc_track_diag_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16118,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16118, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -14798,25 +8369,13 @@ static void multi_dimension_rc_track_diag_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16056,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16056, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14831,18 +8390,8 @@ static void multi_dimension_rc_track_diag_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16121,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16121, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -14866,18 +8415,8 @@ static void multi_dimension_rc_track_diag_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16059,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16059, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -14892,9 +8431,7 @@ static void multi_dimension_rc_track_diag_25_deg_down(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14909,24 +8446,12 @@ static void multi_dimension_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26466,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26466, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14935,24 +8460,12 @@ static void multi_dimension_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26467,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26467, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14961,24 +8474,12 @@ static void multi_dimension_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26465,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26465, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -14987,25 +8488,13 @@ static void multi_dimension_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26468,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 40);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26468, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 40);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -15035,11 +8524,7 @@ static void multi_dimension_rc_track_diag_25_deg_down(
 
 /** rct2: 0x007931E8 */
 static void multi_dimension_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -15051,24 +8536,12 @@ static void multi_dimension_rc_track_diag_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16069,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16069, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -15077,24 +8550,12 @@ static void multi_dimension_rc_track_diag_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16070,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16070, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -15103,24 +8564,12 @@ static void multi_dimension_rc_track_diag_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16068,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16068, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -15133,18 +8582,8 @@ static void multi_dimension_rc_track_diag_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16071,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16071, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 28, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -15158,9 +8597,7 @@ static void multi_dimension_rc_track_diag_60_deg_down(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -15175,24 +8612,12 @@ static void multi_dimension_rc_track_diag_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26478,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26478, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 24);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -15201,24 +8626,12 @@ static void multi_dimension_rc_track_diag_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26479,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26479, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -15227,24 +8640,12 @@ static void multi_dimension_rc_track_diag_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26477,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26477, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 104, 0x20);
                 break;
@@ -15253,25 +8654,13 @@ static void multi_dimension_rc_track_diag_60_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26480,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 88);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26480, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 88);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -15301,11 +8690,7 @@ static void multi_dimension_rc_track_diag_60_deg_down(
 
 /** rct2: 0x00793168 */
 static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -15319,18 +8704,8 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16115,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16115, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15340,25 +8715,13 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16053,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16053, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -15368,18 +8731,8 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16116,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16116, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15389,25 +8742,13 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16054,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16054, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -15417,18 +8758,8 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16114,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16114, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -15438,25 +8769,13 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16052,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16052, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -15470,18 +8789,8 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16117,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16117, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -15505,18 +8814,8 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16055,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16055, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -15531,9 +8830,7 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 break;
         }
@@ -15547,24 +8844,12 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26462,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26462, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -15573,24 +8858,12 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26463,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26463, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -15599,24 +8872,12 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26461,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26461, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -15625,25 +8886,13 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26464,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26464, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -15673,11 +8922,7 @@ static void multi_dimension_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x007931C8 */
 static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -15689,24 +8934,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16065,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16065, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -15715,24 +8948,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16066,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16066, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -15741,24 +8962,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16064,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16064, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -15771,18 +8980,8 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16067,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16067, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 17, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -15796,9 +8995,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -15813,24 +9010,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26474,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height + 24,
-                            0,
-                            0,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26474, -16, -16, 16, 16, 3, height + 24,
+                            0, 0, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -15839,24 +9024,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26475,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26475, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -15865,24 +9038,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26473,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26473, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -15891,25 +9052,13 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26476,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26476, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -15939,11 +9088,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x007931D8 */
 static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -15955,24 +9100,12 @@ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16061,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16061, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -15981,24 +9114,12 @@ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16062,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16062, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16007,24 +9128,12 @@ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16060,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16060, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16037,18 +9146,8 @@ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16063,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16063, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -16062,9 +9161,7 @@ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16079,24 +9176,12 @@ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26470,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26470, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16105,24 +9190,12 @@ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26471,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26471, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16131,24 +9204,12 @@ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26469,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26469, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 72, 0x20);
                 break;
@@ -16157,25 +9218,13 @@ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26472,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 56);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26472, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 56);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -16205,11 +9254,7 @@ static void multi_dimension_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x00793178 */
 static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -16223,18 +9268,8 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16111,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16111, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16244,25 +9279,13 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 3:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16049,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16049, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16273,18 +9296,8 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16112,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16112, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16294,25 +9307,13 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 0:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16050,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16050, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16323,18 +9324,8 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16110,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16110, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
@@ -16344,25 +9335,13 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
                     {
                         case 2:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16048,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16048, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             break;
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16377,18 +9356,8 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16113,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16113, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -16412,18 +9381,8 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
                             break;
                         case 1:
                             sub_98197C_rotated(
-                                session,
-                                direction,
-                                session->TrackColours[SCHEME_TRACK] | 16051,
-                                -16,
-                                -16,
-                                32,
-                                32,
-                                3,
-                                height,
-                                -16,
-                                -16,
-                                height);
+                                session, direction, session->TrackColours[SCHEME_TRACK] | 16051, -16, -16, 32, 32, 3, height,
+                                -16, -16, height);
                             metal_b_supports_paint_setup(
                                 session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                             break;
@@ -16438,9 +9397,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
                     }
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16455,24 +9412,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26458,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26458, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16481,24 +9426,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26459,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26459, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16507,24 +9440,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26457,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26457, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -16533,25 +9454,13 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26460,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26460, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -16581,11 +9490,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x00793218 */
 static void multi_dimension_rc_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -16597,24 +9502,12 @@ static void multi_dimension_rc_track_diag_flat_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16079,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16079, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -16623,37 +9516,15 @@ static void multi_dimension_rc_track_diag_flat_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16076,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16076, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16080,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16080, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -16662,24 +9533,12 @@ static void multi_dimension_rc_track_diag_flat_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16078,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16078, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -16692,18 +9551,8 @@ static void multi_dimension_rc_track_diag_flat_to_left_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16077,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16077, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -16717,9 +9566,7 @@ static void multi_dimension_rc_track_diag_flat_to_left_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -16734,24 +9581,12 @@ static void multi_dimension_rc_track_diag_flat_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26504,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26504, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -16760,24 +9595,12 @@ static void multi_dimension_rc_track_diag_flat_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26501,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26501, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -16786,24 +9609,12 @@ static void multi_dimension_rc_track_diag_flat_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26503,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26503, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -16812,26 +9623,15 @@ static void multi_dimension_rc_track_diag_flat_to_left_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26502,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26502, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -16860,11 +9660,7 @@ static void multi_dimension_rc_track_diag_flat_to_left_bank(
 
 /** rct2: 0x00793228 */
 static void multi_dimension_rc_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -16876,24 +9672,12 @@ static void multi_dimension_rc_track_diag_flat_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16084,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16084, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -16902,24 +9686,12 @@ static void multi_dimension_rc_track_diag_flat_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16081,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16081, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -16928,37 +9700,15 @@ static void multi_dimension_rc_track_diag_flat_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16083,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16083, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16085,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16085, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -16971,18 +9721,8 @@ static void multi_dimension_rc_track_diag_flat_to_right_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16082,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16082, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -16996,9 +9736,7 @@ static void multi_dimension_rc_track_diag_flat_to_right_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17013,24 +9751,12 @@ static void multi_dimension_rc_track_diag_flat_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26508,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26508, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17039,24 +9765,12 @@ static void multi_dimension_rc_track_diag_flat_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26505,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26505, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17065,24 +9779,12 @@ static void multi_dimension_rc_track_diag_flat_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26507,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26507, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17091,26 +9793,15 @@ static void multi_dimension_rc_track_diag_flat_to_right_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26506,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26506, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -17139,11 +9830,7 @@ static void multi_dimension_rc_track_diag_flat_to_right_bank(
 
 /** rct2: 0x00793238 */
 static void multi_dimension_rc_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -17155,24 +9842,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16082,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16082, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17181,37 +9856,15 @@ static void multi_dimension_rc_track_diag_left_bank_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16083,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16083, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16085,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16085, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17220,24 +9873,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16081,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16081, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17250,18 +9891,8 @@ static void multi_dimension_rc_track_diag_left_bank_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16084,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16084, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -17275,9 +9906,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_flat(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17292,24 +9921,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26506,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26506, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17318,24 +9935,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26507,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26507, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17344,24 +9949,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26505,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26505, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17370,26 +9963,15 @@ static void multi_dimension_rc_track_diag_left_bank_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26508,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26508, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -17418,11 +10000,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_flat(
 
 /** rct2: 0x00793248 */
 static void multi_dimension_rc_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -17434,24 +10012,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16077,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16077, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17460,24 +10026,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16078,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16078, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17486,37 +10040,15 @@ static void multi_dimension_rc_track_diag_right_bank_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16076,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16076, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16080,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16080, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17529,18 +10061,8 @@ static void multi_dimension_rc_track_diag_right_bank_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16079,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16079, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -17554,9 +10076,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_flat(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17571,24 +10091,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26502,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26502, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17597,24 +10105,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26503,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26503, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17623,24 +10119,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26501,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26501, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -17649,26 +10133,15 @@ static void multi_dimension_rc_track_diag_right_bank_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26504,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26504, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -17697,11 +10170,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_flat(
 
 /** rct2: 0x00793278 */
 static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -17713,24 +10182,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16099,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16099, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -17739,37 +10196,15 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16096,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16096, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16100,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16100, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -17778,24 +10213,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16098,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16098, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -17808,18 +10231,8 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16097,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16097, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -17833,9 +10246,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -17850,24 +10261,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26520,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26520, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -17876,24 +10275,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26517,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26517, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -17902,24 +10289,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26519,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26519, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -17928,25 +10303,13 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26518,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26518, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -17976,11 +10339,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x00793288 */
 static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -17992,24 +10351,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16104,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16104, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -18018,24 +10365,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16101,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16101, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -18044,37 +10379,15 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16103,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16103, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16105,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16105, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -18087,18 +10400,8 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16102,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16102, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -18112,9 +10415,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -18129,24 +10430,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26524,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26524, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -18155,24 +10444,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26521,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26521, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -18181,24 +10458,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26523,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26523, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -18207,25 +10472,13 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26522,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26522, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -18255,11 +10508,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x00793258 */
 static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -18271,24 +10520,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16089,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16089, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18297,37 +10534,15 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16086,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16086, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16090,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16090, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18336,24 +10551,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16088,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16088, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18366,18 +10569,8 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16087,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16087, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -18391,9 +10584,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18408,24 +10599,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26512,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26512, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18434,24 +10613,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26509,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26509, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18460,24 +10627,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26511,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26511, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18486,25 +10641,13 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26510,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26510, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -18534,11 +10677,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x00793268 */
 static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -18550,24 +10689,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16094,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16094, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18576,24 +10703,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16091,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16091, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18602,37 +10717,15 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16093,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16093, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16095,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16095, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18645,18 +10738,8 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16092,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16092, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -18670,9 +10753,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18687,24 +10768,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26516,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26516, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18713,24 +10782,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26513,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26513, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18739,24 +10796,12 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26515,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26515, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 56, 0x20);
                 break;
@@ -18765,25 +10810,13 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26514,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26514, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -18813,11 +10846,7 @@ static void multi_dimension_rc_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x00793298 */
 static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -18829,24 +10858,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16092,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16092, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -18854,37 +10871,15 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16093,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16093, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16095,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16095, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -18892,24 +10887,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16091,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16091, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -18921,18 +10904,8 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16094,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16094, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -18946,9 +10919,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 break;
         }
@@ -18962,24 +10933,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26514,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26514, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -18987,24 +10946,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26515,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26515, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -19012,24 +10959,12 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26513,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26513, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -19037,25 +10972,13 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26516,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26516, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -19085,11 +11008,7 @@ static void multi_dimension_rc_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x007932A8 */
 static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -19101,24 +11020,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16087,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16087, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -19126,24 +11033,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16088,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16088, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -19151,37 +11046,15 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16086,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16086, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16090,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16090, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -19193,18 +11066,8 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16089,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16089, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -19218,9 +11081,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 break;
         }
@@ -19234,24 +11095,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26510,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26510, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 1:
@@ -19259,24 +11108,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26511,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26511, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 break;
             case 2:
@@ -19284,24 +11121,12 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26509,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26509, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 break;
             case 3:
@@ -19309,25 +11134,13 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26512,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26512, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -19357,11 +11170,7 @@ static void multi_dimension_rc_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x007932B8 */
 static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -19373,24 +11182,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16102,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16102, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19399,37 +11196,15 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16103,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16103, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16105,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16105, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19438,24 +11213,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16101,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16101, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19468,18 +11231,8 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16104,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16104, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -19493,9 +11246,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19510,24 +11261,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26522,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26522, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19536,24 +11275,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26523,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26523, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19562,24 +11289,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26521,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26521, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19588,25 +11303,13 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26524,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26524, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -19636,11 +11339,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x007932C8 */
 static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -19652,24 +11351,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16097,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16097, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19678,24 +11365,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16098,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16098, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19704,37 +11379,15 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16096,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16096, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16100,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16100, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19747,18 +11400,8 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16099,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16099, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -19772,9 +11415,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19789,24 +11430,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26518,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26518, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19815,24 +11444,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26519,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26519, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19841,24 +11458,12 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26517,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26517, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 48, 0x20);
                 break;
@@ -19867,25 +11472,13 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26520,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 32);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26520, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 32);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 switch (direction)
                 {
@@ -19915,11 +11508,7 @@ static void multi_dimension_rc_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x007931F8 */
 static void multi_dimension_rc_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -19931,24 +11520,12 @@ static void multi_dimension_rc_track_diag_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16075,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16075, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -19957,24 +11534,12 @@ static void multi_dimension_rc_track_diag_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16072,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16072, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -19983,24 +11548,12 @@ static void multi_dimension_rc_track_diag_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16074,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16074, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20013,18 +11566,8 @@ static void multi_dimension_rc_track_diag_left_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16073,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16073, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -20038,9 +11581,7 @@ static void multi_dimension_rc_track_diag_left_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20055,24 +11596,12 @@ static void multi_dimension_rc_track_diag_left_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26500,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26500, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20081,24 +11610,12 @@ static void multi_dimension_rc_track_diag_left_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26497,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26497, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20107,24 +11624,12 @@ static void multi_dimension_rc_track_diag_left_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26499,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26499, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20133,26 +11638,15 @@ static void multi_dimension_rc_track_diag_left_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26498,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26498, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -20181,11 +11675,7 @@ static void multi_dimension_rc_track_diag_left_bank(
 
 /** rct2: 0x00793208 */
 static void multi_dimension_rc_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -20197,24 +11687,12 @@ static void multi_dimension_rc_track_diag_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16073,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16073, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20223,24 +11701,12 @@ static void multi_dimension_rc_track_diag_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16074,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16074, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20249,24 +11715,12 @@ static void multi_dimension_rc_track_diag_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16072,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16072, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20279,18 +11733,8 @@ static void multi_dimension_rc_track_diag_right_bank(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16075,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16075, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES_INVERTED, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -20304,9 +11748,7 @@ static void multi_dimension_rc_track_diag_right_bank(
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20321,24 +11763,12 @@ static void multi_dimension_rc_track_diag_right_bank(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26498,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26498, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20347,24 +11777,12 @@ static void multi_dimension_rc_track_diag_right_bank(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26499,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26499, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20373,24 +11791,12 @@ static void multi_dimension_rc_track_diag_right_bank(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26497,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26497, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
                 paint_util_set_segment_support_height(
-                    session,
-                    paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction),
-                    0xFFFF,
+                    session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_D4, direction), 0xFFFF,
                     0);
                 paint_util_set_general_support_height(session, height + 32, 0x20);
                 break;
@@ -20399,26 +11805,15 @@ static void multi_dimension_rc_track_diag_right_bank(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26500,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 24,
-                            -16,
-                            -16,
-                            height + 22);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26500, -16, -16, 32, 32, 3, height + 24,
+                            -16, -16, height + 22);
                         break;
                 }
 
                 paint_util_set_segment_support_height(
                     session,
                     paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0, direction),
-                    0xFFFF,
-                    0);
+                    0xFFFF, 0);
                 switch (direction)
                 {
                     case 0:
@@ -20447,11 +11842,7 @@ static void multi_dimension_rc_track_diag_right_bank(
 
 /** rct2: 0x007932D8 */
 static void multi_dimension_rc_track_left_flyer_twist_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -20486,8 +11877,7 @@ static void multi_dimension_rc_track_left_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -20495,17 +11885,7 @@ static void multi_dimension_rc_track_left_flyer_twist_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26369,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26369, 0, 6, 32, 20, 3, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 1:
@@ -20525,8 +11905,7 @@ static void multi_dimension_rc_track_left_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -20534,17 +11913,7 @@ static void multi_dimension_rc_track_left_flyer_twist_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26370,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26370, 0, 6, 32, 20, 3, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 1:
@@ -20565,8 +11934,7 @@ static void multi_dimension_rc_track_left_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -20586,11 +11954,7 @@ static void multi_dimension_rc_track_left_flyer_twist_up(
 
 /** rct2: 0x007932E8 */
 static void multi_dimension_rc_track_right_flyer_twist_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -20625,8 +11989,7 @@ static void multi_dimension_rc_track_right_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -20653,8 +12016,7 @@ static void multi_dimension_rc_track_right_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -20682,8 +12044,7 @@ static void multi_dimension_rc_track_right_flyer_twist_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -20703,11 +12064,7 @@ static void multi_dimension_rc_track_right_flyer_twist_up(
 
 /** rct2: 0x007932F8 */
 static void multi_dimension_rc_track_left_flyer_twist_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -20725,17 +12082,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26370,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26370, 0, 6, 32, 20, 3, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 3:
@@ -20748,8 +12095,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -20772,17 +12118,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26369,
-                        0,
-                        6,
-                        32,
-                        20,
-                        3,
-                        height + 24,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26369, 0, 6, 32, 20, 3, height + 24, 0, 6,
                         height + 24);
                     break;
                 case 3:
@@ -20794,8 +12130,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -20833,8 +12168,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -20842,11 +12176,7 @@ static void multi_dimension_rc_track_left_flyer_twist_down(
 
 /** rct2: 0x00793308 */
 static void multi_dimension_rc_track_right_flyer_twist_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -20876,8 +12206,7 @@ static void multi_dimension_rc_track_right_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES_INVERTED, 4, 0, height + 36, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -20911,8 +12240,7 @@ static void multi_dimension_rc_track_right_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -20950,8 +12278,7 @@ static void multi_dimension_rc_track_right_flyer_twist_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -20959,11 +12286,7 @@ static void multi_dimension_rc_track_right_flyer_twist_down(
 
 /** rct2: 0x00793398 */
 static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -20975,62 +12298,22 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26539,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26539, 0, 0, 32, 20, 3, height + 16, 0, 6,
                             height + 16);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26542,
-                            0,
-                            0,
-                            2,
-                            20,
-                            3,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26542, 0, 0, 2, 20, 3, height + 16, 0, 6,
                             height + 18);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26545,
-                            0,
-                            0,
-                            2,
-                            20,
-                            3,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26545, 0, 0, 2, 20, 3, height + 16, 0, 6,
                             height + 18);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26548,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26548, 0, 0, 32, 20, 3, height + 16, 0, 6,
                             height + 16);
                         break;
                 }
@@ -21047,63 +12330,23 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26538,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height + 16,
-                            24,
-                            6,
-                            height + 16);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26538, 0, 0, 2, 20, 31, height + 16, 24,
+                            6, height + 16);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26541,
-                            0,
-                            0,
-                            2,
-                            20,
-                            3,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26541, 0, 0, 2, 20, 3, height + 16, 0, 6,
                             height + 18);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26544,
-                            0,
-                            0,
-                            2,
-                            20,
-                            3,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26544, 0, 0, 2, 20, 3, height + 16, 0, 6,
                             height + 18);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26547,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height + 16,
-                            24,
-                            6,
-                            height + 16);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26547, 0, 0, 2, 20, 31, height + 16, 24,
+                            6, height + 16);
                         break;
                 }
                 paint_util_set_segment_support_height(
@@ -21115,63 +12358,23 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26537,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height + 16,
-                            28,
-                            6,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26537, 0, 0, 2, 20, 31, height + 16, 28,
+                            6, height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26540,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26540, 0, 0, 2, 20, 31, height + 16, 0, 6,
                             height + 24);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26543,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26543, 0, 0, 2, 20, 31, height + 16, 0, 6,
                             height + 24);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26546,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height + 16,
-                            29,
-                            6,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26546, 0, 0, 2, 20, 31, height + 16, 29,
+                            6, height + 24);
                         break;
                 }
                 paint_util_set_segment_support_height(
@@ -21191,62 +12394,22 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16208,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16208, 0, 0, 32, 20, 3, height, 0, 6,
                             height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16211,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16211, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16214,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16214, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16217,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16217, 0, 0, 32, 20, 3, height, 0, 6,
                             height + 24);
                         break;
                 }
@@ -21263,62 +12426,22 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16207,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            -8,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16207, 0, 0, 2, 20, 31, height, -8, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16210,
-                            0,
-                            0,
-                            2,
-                            20,
-                            63,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16210, 0, 0, 2, 20, 63, height, 24, 6,
                             height + 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16213,
-                            0,
-                            0,
-                            2,
-                            20,
-                            63,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16213, 0, 0, 2, 20, 63, height, 24, 6,
                             height + 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16216,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            -8,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16216, 0, 0, 2, 20, 31, height, -8, 6,
                             height);
                         break;
                 }
@@ -21331,62 +12454,22 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16206,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            4,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16206, 0, 0, 2, 20, 31, height, 4, 6,
                             height + 8);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16209,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16209, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16212,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16212, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16215,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            4,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16215, 0, 0, 2, 20, 31, height, 4, 6,
                             height + 8);
                         break;
                 }
@@ -21402,11 +12485,7 @@ static void multi_dimension_rc_track_multidim_inverted_flat_to_90_deg_quarter_lo
 
 /** rct2: 0x00793318 */
 static void multi_dimension_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -21437,33 +12516,13 @@ static void multi_dimension_rc_track_block_brakes(
             case 0:
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26551,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26551, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
             case 1:
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26552,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 24,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26552, 0, 0, 32, 20, 3, height + 24, 0, 6,
                     height + 24);
                 break;
         }
@@ -21483,11 +12542,7 @@ static void multi_dimension_rc_track_block_brakes(
 
 /** rct2: 0x00793388 */
 static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -21499,62 +12554,22 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16206,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            4,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16206, 0, 0, 2, 20, 31, height, 4, 6,
                             height + 8);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16209,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16209, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16212,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16212, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16215,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            4,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16215, 0, 0, 2, 20, 31, height, 4, 6,
                             height + 8);
                         break;
                 }
@@ -21567,62 +12582,22 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16207,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            -8,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16207, 0, 0, 2, 20, 31, height, -8, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16210,
-                            0,
-                            0,
-                            2,
-                            20,
-                            63,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16210, 0, 0, 2, 20, 63, height, 24, 6,
                             height + 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16213,
-                            0,
-                            0,
-                            2,
-                            20,
-                            63,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16213, 0, 0, 2, 20, 63, height, 24, 6,
                             height + 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16216,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            -8,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16216, 0, 0, 2, 20, 31, height, -8, 6,
                             height);
                         break;
                 }
@@ -21635,62 +12610,22 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16208,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16208, 0, 0, 32, 20, 3, height, 0, 6,
                             height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16211,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16211, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16214,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16214, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16217,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16217, 0, 0, 32, 20, 3, height, 0, 6,
                             height + 24);
                         break;
                 }
@@ -21713,63 +12648,23 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26537,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            28,
-                            6,
-                            height - 8);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26537, 0, 0, 2, 20, 31, height - 16, 28,
+                            6, height - 8);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26540,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26540, 0, 0, 2, 20, 31, height - 16, 0, 6,
                             height - 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26543,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26543, 0, 0, 2, 20, 31, height - 16, 0, 6,
                             height - 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26546,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            28,
-                            6,
-                            height - 8);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26546, 0, 0, 2, 20, 31, height - 16, 28,
+                            6, height - 8);
                         break;
                 }
                 paint_util_set_segment_support_height(
@@ -21781,63 +12676,23 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26538,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            24,
-                            6,
-                            height - 16);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26538, 0, 0, 2, 20, 31, height - 16, 24,
+                            6, height - 16);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26541,
-                            0,
-                            0,
-                            2,
-                            20,
-                            63,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26541, 0, 0, 2, 20, 63, height - 16, 0, 6,
                             height - 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26544,
-                            0,
-                            0,
-                            2,
-                            20,
-                            63,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26544, 0, 0, 2, 20, 63, height - 16, 0, 6,
                             height - 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26547,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            24,
-                            6,
-                            height - 16);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26547, 0, 0, 2, 20, 31, height - 16, 24,
+                            6, height - 16);
                         break;
                 }
                 paint_util_set_segment_support_height(
@@ -21849,62 +12704,22 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26539,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26539, 0, 0, 32, 20, 3, height - 16, 0, 6,
                             height - 16);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26542,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26542, 0, 0, 2, 20, 31, height - 16, 0, 6,
                             height - 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26545,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26545, 0, 0, 2, 20, 31, height - 16, 0, 6,
                             height - 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26548,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26548, 0, 0, 32, 20, 3, height - 16, 0, 6,
                             height - 16);
                         break;
                 }
@@ -21922,11 +12737,7 @@ static void multi_dimension_rc_track_multidim_90_deg_up_to_inverted_flat_quarter
 
 /** rct2: 0x00793398 */
 static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -21938,62 +12749,22 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26539,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26539, 0, 0, 32, 20, 3, height + 16, 0, 6,
                             height + 16);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26542,
-                            0,
-                            0,
-                            2,
-                            20,
-                            3,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26542, 0, 0, 2, 20, 3, height + 16, 0, 6,
                             height + 18);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26545,
-                            0,
-                            0,
-                            2,
-                            20,
-                            3,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26545, 0, 0, 2, 20, 3, height + 16, 0, 6,
                             height + 18);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26548,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26548, 0, 0, 32, 20, 3, height + 16, 0, 6,
                             height + 16);
                         break;
                 }
@@ -22010,63 +12781,23 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26538,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height + 16,
-                            24,
-                            6,
-                            height + 16);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26538, 0, 0, 2, 20, 31, height + 16, 24,
+                            6, height + 16);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26541,
-                            0,
-                            0,
-                            2,
-                            20,
-                            3,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26541, 0, 0, 2, 20, 3, height + 16, 0, 6,
                             height + 18);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26544,
-                            0,
-                            0,
-                            2,
-                            20,
-                            3,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26544, 0, 0, 2, 20, 3, height + 16, 0, 6,
                             height + 18);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26547,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height + 16,
-                            24,
-                            6,
-                            height + 16);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26547, 0, 0, 2, 20, 31, height + 16, 24,
+                            6, height + 16);
                         break;
                 }
                 paint_util_set_segment_support_height(
@@ -22078,63 +12809,23 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26537,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height + 16,
-                            28,
-                            6,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26537, 0, 0, 2, 20, 31, height + 16, 28,
+                            6, height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26540,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26540, 0, 0, 2, 20, 31, height + 16, 0, 6,
                             height + 24);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26543,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height + 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26543, 0, 0, 2, 20, 31, height + 16, 0, 6,
                             height + 24);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26546,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height + 16,
-                            29,
-                            6,
-                            height + 24);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26546, 0, 0, 2, 20, 31, height + 16, 29,
+                            6, height + 24);
                         break;
                 }
                 paint_util_set_segment_support_height(
@@ -22154,62 +12845,22 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16208,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16208, 0, 0, 32, 20, 3, height, 0, 6,
                             height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16211,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16211, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16214,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16214, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16217,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16217, 0, 0, 32, 20, 3, height, 0, 6,
                             height + 24);
                         break;
                 }
@@ -22226,62 +12877,22 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16207,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            -8,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16207, 0, 0, 2, 20, 31, height, -8, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16210,
-                            0,
-                            0,
-                            2,
-                            20,
-                            63,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16210, 0, 0, 2, 20, 63, height, 24, 6,
                             height + 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16213,
-                            0,
-                            0,
-                            2,
-                            20,
-                            63,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16213, 0, 0, 2, 20, 63, height, 24, 6,
                             height + 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16216,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            -8,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16216, 0, 0, 2, 20, 31, height, -8, 6,
                             height);
                         break;
                 }
@@ -22294,62 +12905,22 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16206,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            4,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16206, 0, 0, 2, 20, 31, height, 4, 6,
                             height + 8);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16209,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16209, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16212,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16212, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16215,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            4,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16215, 0, 0, 2, 20, 31, height, 4, 6,
                             height + 8);
                         break;
                 }
@@ -22365,11 +12936,7 @@ static void multi_dimension_rc_track_multidim_flat_to_90_deg_down_quarter_loop(
 
 /** rct2: 0x00793388 */
 static void multi_dimension_rc_track_elem_255(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (!track_element_is_inverted(tileElement))
@@ -22381,62 +12948,22 @@ static void multi_dimension_rc_track_elem_255(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16206,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            4,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16206, 0, 0, 2, 20, 31, height, 4, 6,
                             height + 8);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16209,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16209, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16212,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16212, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16215,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            4,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16215, 0, 0, 2, 20, 31, height, 4, 6,
                             height + 8);
                         break;
                 }
@@ -22449,62 +12976,22 @@ static void multi_dimension_rc_track_elem_255(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16207,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            -8,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16207, 0, 0, 2, 20, 31, height, -8, 6,
                             height);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16210,
-                            0,
-                            0,
-                            2,
-                            20,
-                            63,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16210, 0, 0, 2, 20, 63, height, 24, 6,
                             height + 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16213,
-                            0,
-                            0,
-                            2,
-                            20,
-                            63,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16213, 0, 0, 2, 20, 63, height, 24, 6,
                             height + 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16216,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            -8,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16216, 0, 0, 2, 20, 31, height, -8, 6,
                             height);
                         break;
                 }
@@ -22517,62 +13004,22 @@ static void multi_dimension_rc_track_elem_255(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16208,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16208, 0, 0, 32, 20, 3, height, 0, 6,
                             height + 24);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16211,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16211, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16214,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height,
-                            24,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16214, 0, 0, 2, 20, 31, height, 24, 6,
                             height + 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 16217,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 16217, 0, 0, 32, 20, 3, height, 0, 6,
                             height + 24);
                         break;
                 }
@@ -22595,63 +13042,23 @@ static void multi_dimension_rc_track_elem_255(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26537,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            28,
-                            6,
-                            height - 8);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26537, 0, 0, 2, 20, 31, height - 16, 28,
+                            6, height - 8);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26540,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26540, 0, 0, 2, 20, 31, height - 16, 0, 6,
                             height - 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26543,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26543, 0, 0, 2, 20, 31, height - 16, 0, 6,
                             height - 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26546,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            28,
-                            6,
-                            height - 8);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26546, 0, 0, 2, 20, 31, height - 16, 28,
+                            6, height - 8);
                         break;
                 }
                 paint_util_set_segment_support_height(
@@ -22663,63 +13070,23 @@ static void multi_dimension_rc_track_elem_255(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26538,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            24,
-                            6,
-                            height - 16);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26538, 0, 0, 2, 20, 31, height - 16, 24,
+                            6, height - 16);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26541,
-                            0,
-                            0,
-                            2,
-                            20,
-                            63,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26541, 0, 0, 2, 20, 63, height - 16, 0, 6,
                             height - 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26544,
-                            0,
-                            0,
-                            2,
-                            20,
-                            63,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26544, 0, 0, 2, 20, 63, height - 16, 0, 6,
                             height - 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26547,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            24,
-                            6,
-                            height - 16);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26547, 0, 0, 2, 20, 31, height - 16, 24,
+                            6, height - 16);
                         break;
                 }
                 paint_util_set_segment_support_height(
@@ -22731,62 +13098,22 @@ static void multi_dimension_rc_track_elem_255(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26539,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26539, 0, 0, 32, 20, 3, height - 16, 0, 6,
                             height - 16);
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26542,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26542, 0, 0, 2, 20, 31, height - 16, 0, 6,
                             height - 8);
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26545,
-                            0,
-                            0,
-                            2,
-                            20,
-                            31,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26545, 0, 0, 2, 20, 31, height - 16, 0, 6,
                             height - 8);
                         break;
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26548,
-                            0,
-                            0,
-                            32,
-                            20,
-                            3,
-                            height - 16,
-                            0,
-                            6,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26548, 0, 0, 32, 20, 3, height - 16, 0, 6,
                             height - 16);
                         break;
                 }
diff --git a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp
index e132bc456f..24644a6d42 100644
--- a/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp
+++ b/src/openrct2/ride/coaster/ReverseFreefallCoaster.cpp
@@ -194,11 +194,7 @@ static constexpr const uint32_t reverse_freefall_rc_track_pieces_vertical_suppor
 };
 
 static void paint_reverse_freefall_rc_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (direction & 1)
@@ -220,11 +216,7 @@ static void paint_reverse_freefall_rc_flat(
 }
 
 static void paint_reverse_freefall_rc_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     Ride* ride = get_ride(rideIndex);
@@ -266,11 +258,7 @@ static void paint_reverse_freefall_rc_station(
 }
 
 static void paint_reverse_freefall_rc_slope(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     TESTPAINT_IGNORE_ALL();
@@ -335,34 +323,14 @@ static void paint_reverse_freefall_rc_slope(
                 }
                 sub_98197C(session, floorImageId, 0, 0, 26, 26, 126, height, 3, 3, height);
                 sub_98199C_rotated(
-                    session,
-                    direction,
-                    supportsImageId,
-                    0,
-                    0,
-                    isDirection03 ? 26 : 18,
-                    26,
-                    126,
-                    height,
-                    isDirection03 ? 3 : 11,
-                    3,
-                    height);
+                    session, direction, supportsImageId, 0, 0, isDirection03 ? 26 : 18, 26, 126, height, isDirection03 ? 3 : 11,
+                    3, height);
             }
             else
             {
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    supportsImageId,
-                    0,
-                    0,
-                    isDirection03 ? 26 : 18,
-                    26,
-                    126,
-                    height,
-                    isDirection03 ? 3 : 11,
-                    3,
-                    height);
+                    session, direction, supportsImageId, 0, 0, isDirection03 ? 26 : 18, 26, 126, height, isDirection03 ? 3 : 11,
+                    3, height);
             }
             paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
             paint_util_set_general_support_height(session, height + supportHeights[trackSequence], 0x20);
@@ -386,11 +354,7 @@ static void paint_reverse_freefall_rc_slope(
 }
 
 static void paint_reverse_freefall_rc_vertical(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t supportsImageId, trackImageId;
diff --git a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp
index d02e006e9b..14480728a0 100644
--- a/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/ReverserRollerCoaster.cpp
@@ -26,12 +26,7 @@
  *  rct2: 0x006D4453
  */
 void vehicle_visual_reverser(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     rct_vehicle* v1 = GET_VEHICLE(vehicle->prev_vehicle_on_ride);
@@ -47,11 +42,7 @@ void vehicle_visual_reverser(
 
 /** rct2: 0x0086E65C */
 static void reverser_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -96,11 +87,7 @@ static void reverser_rc_track_flat(
 }
 
 static void reverser_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -113,17 +100,7 @@ static void reverser_rc_track_station(
     sub_98197C_rotated(
         session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 27, 2, height, 0, 2, height);
     sub_98199C_rotated(
-        session,
-        direction,
-        imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-        0,
-        0,
-        32,
-        27,
-        2,
-        height,
-        0,
-        2,
+        session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 27, 2, height, 0, 2,
         height);
     wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
     track_paint_util_draw_station_2(session, rideIndex, direction, height, tileElement, 9, 11);
@@ -134,11 +111,7 @@ static void reverser_rc_track_station(
 
 /** rct2: 0x0086E66C */
 static void reverser_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -207,11 +180,7 @@ static void reverser_rc_track_25_deg_up(
 
 /** rct2: 0x0086E67C */
 static void reverser_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -280,11 +249,7 @@ static void reverser_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x0086E68C */
 static void reverser_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -353,11 +318,7 @@ static void reverser_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x0086E69C */
 static void reverser_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     reverser_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -365,11 +326,7 @@ static void reverser_rc_track_25_deg_down(
 
 /** rct2: 0x0086E6AC */
 static void reverser_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     reverser_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -377,11 +334,7 @@ static void reverser_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x0086E6BC */
 static void reverser_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     reverser_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -389,11 +342,7 @@ static void reverser_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x0086E6CC */
 static void reverser_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -462,8 +411,7 @@ static void reverser_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -495,8 +443,7 @@ static void reverser_rc_track_left_quarter_turn_5(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -532,8 +479,7 @@ static void reverser_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -577,11 +523,7 @@ static void reverser_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x0086E6DC */
 static void reverser_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -590,11 +532,7 @@ static void reverser_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x0086E6EC */
 static void reverser_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -658,8 +596,7 @@ static void reverser_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -690,8 +627,7 @@ static void reverser_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -735,11 +671,7 @@ static void reverser_rc_track_s_bend_left(
 
 /** rct2: 0x0086E6FC */
 static void reverser_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -803,8 +735,7 @@ static void reverser_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -835,8 +766,7 @@ static void reverser_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -880,11 +810,7 @@ static void reverser_rc_track_s_bend_right(
 
 /** rct2: 0x0086E73C */
 static void reverser_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -928,17 +854,7 @@ static void reverser_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21558,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21558, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -947,32 +863,12 @@ static void reverser_rc_track_left_quarter_turn_3(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21564,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21564, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21555,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21555, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     break;
             }
@@ -1021,11 +917,7 @@ static void reverser_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x0086E74C */
 static void reverser_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -1034,11 +926,7 @@ static void reverser_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x0086E75C */
 static void reverser_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1063,11 +951,7 @@ static void reverser_rc_track_brakes(
 
 /** rct2: 0x0086E76C */
 static void reverser_rc_track_left_reverser(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1252,11 +1136,7 @@ static void reverser_rc_track_left_reverser(
 
 /** rct2: 0x0086E77C */
 static void reverser_rc_track_right_reverser(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
diff --git a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp
index 7e6af01ce9..f36600f7cf 100644
--- a/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/SideFrictionRollerCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x0077839C */
 static void side_friction_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -36,17 +32,7 @@ static void side_friction_rc_track_flat(
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 21662, 0, 0, 32, 27, 2, height, 0, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 21664,
-                    0,
-                    0,
-                    32,
-                    27,
-                    0,
-                    height,
-                    0,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 21664, 0, 0, 32, 27, 0, height, 0, 2,
                     height + 27);
                 wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                 break;
@@ -54,17 +40,7 @@ static void side_friction_rc_track_flat(
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 21663, 0, 0, 32, 27, 2, height, 0, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 21665,
-                    0,
-                    0,
-                    32,
-                    27,
-                    0,
-                    height,
-                    0,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 21665, 0, 0, 32, 27, 0, height, 0, 2,
                     height + 27);
                 wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                 break;
@@ -72,17 +48,7 @@ static void side_friction_rc_track_flat(
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 21666, 0, 0, 32, 27, 2, height, 0, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 21668,
-                    0,
-                    0,
-                    32,
-                    27,
-                    0,
-                    height,
-                    0,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 21668, 0, 0, 32, 27, 0, height, 0, 2,
                     height + 27);
                 wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                 break;
@@ -90,17 +56,7 @@ static void side_friction_rc_track_flat(
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 21667, 0, 0, 32, 27, 2, height, 0, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 21669,
-                    0,
-                    0,
-                    32,
-                    27,
-                    0,
-                    height,
-                    0,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 21669, 0, 0, 32, 27, 0, height, 0, 2,
                     height + 27);
                 wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                 break;
@@ -115,17 +71,7 @@ static void side_friction_rc_track_flat(
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 21606, 0, 0, 32, 27, 2, height, 0, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 21608,
-                    0,
-                    0,
-                    32,
-                    27,
-                    0,
-                    height,
-                    0,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 21608, 0, 0, 32, 27, 0, height, 0, 2,
                     height + 27);
                 wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                 break;
@@ -134,17 +80,7 @@ static void side_friction_rc_track_flat(
                 sub_98197C_rotated(
                     session, direction, session->TrackColours[SCHEME_TRACK] | 21607, 0, 0, 32, 27, 2, height, 0, 2, height);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 21609,
-                    0,
-                    0,
-                    32,
-                    27,
-                    0,
-                    height,
-                    0,
-                    2,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 21609, 0, 0, 32, 27, 0, height, 0, 2,
                     height + 27);
                 wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                 break;
@@ -157,11 +93,7 @@ static void side_friction_rc_track_flat(
 
 /** rct2: 0x007784AC, 0x007784BC, 0x007784CC */
 static void side_friction_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4] = {
@@ -182,11 +114,7 @@ static void side_friction_rc_track_station(
 
 /** rct2: 0x007783AC */
 static void side_friction_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -271,11 +199,7 @@ static void side_friction_rc_track_25_deg_up(
 
 /** rct2: 0x007783CC */
 static void side_friction_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -360,11 +284,7 @@ static void side_friction_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x007783FC */
 static void side_friction_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -449,11 +369,7 @@ static void side_friction_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x0077840C */
 static void side_friction_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     side_friction_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -461,11 +377,7 @@ static void side_friction_rc_track_25_deg_down(
 
 /** rct2: 0x0077842C */
 static void side_friction_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     side_friction_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -473,11 +385,7 @@ static void side_friction_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x0077845C */
 static void side_friction_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     side_friction_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -485,11 +393,7 @@ static void side_friction_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x0077846C */
 static void side_friction_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -501,17 +405,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21727, 0, 2, 32, 27, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21747,
-                        0,
-                        2,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21747, 0, 2, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -519,17 +413,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21732, 0, 2, 32, 27, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21752,
-                        0,
-                        2,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21752, 0, 2, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -537,17 +421,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21737, 0, 2, 32, 32, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21757,
-                        0,
-                        2,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21757, 0, 2, 32, 32, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -555,17 +429,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21722, 0, 2, 32, 32, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21742,
-                        0,
-                        2,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21742, 0, 2, 32, 32, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -589,17 +453,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21726, 0, 0, 32, 16, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21746,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21746, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -607,17 +461,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21731, 0, 0, 32, 16, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21751,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21751, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -625,17 +469,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21736, 0, 16, 32, 16, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21756,
-                        0,
-                        16,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21756, 0, 16, 32, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -643,17 +477,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21721, 0, 16, 32, 16, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21741,
-                        0,
-                        16,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21741, 0, 16, 32, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -662,8 +486,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -673,17 +496,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21725, 0, 16, 16, 16, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21745,
-                        0,
-                        16,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21745, 0, 16, 16, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -691,17 +504,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21730, 16, 16, 16, 16, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21750,
-                        16,
-                        16,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21750, 16, 16, 16, 16, 0, height, 16, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -709,17 +512,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21735, 16, 0, 16, 16, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21755,
-                        16,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21755, 16, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -727,17 +520,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21720, 0, 0, 16, 16, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21740,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21740, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -747,8 +530,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -763,17 +545,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21724, 16, 0, 16, 34, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21744,
-                        16,
-                        0,
-                        16,
-                        34,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21744, 16, 0, 16, 34, 0, height, 16, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -781,17 +553,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21729, 0, 0, 16, 32, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21749,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21749, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -799,17 +561,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21734, 0, 0, 16, 32, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21754,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21754, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -817,17 +569,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21719, 16, 0, 16, 32, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21739,
-                        16,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21739, 16, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -836,8 +578,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -847,17 +588,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21723, 2, 0, 32, 32, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21743,
-                        2,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21743, 2, 0, 32, 32, 0, height, 2, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -865,17 +596,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21728, 2, 0, 27, 32, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21748,
-                        2,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21748, 2, 0, 27, 32, 0, height, 2, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -883,17 +604,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21733, 2, 0, 27, 32, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21753,
-                        2,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21753, 2, 0, 27, 32, 0, height, 2, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -901,17 +612,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
                     sub_98196C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21718, 2, 0, 32, 32, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21738,
-                        2,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21738, 2, 0, 32, 32, 0, height, 2, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -933,11 +634,7 @@ static void side_friction_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x0077847C */
 static void side_friction_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -946,11 +643,7 @@ static void side_friction_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x0077848C */
 static void side_friction_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -962,17 +655,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21888, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21904,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21904, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -980,17 +663,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21892, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21908,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21908, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -998,17 +671,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21891, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21907,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21907, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1016,17 +679,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21895, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21911,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21911, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1045,17 +698,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21889, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21905,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21905, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1063,17 +706,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21893, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21909,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21909, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1081,17 +714,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21890, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21906,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21906, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1099,17 +722,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21894, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21910,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21910, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1118,8 +731,7 @@ static void side_friction_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -1129,17 +741,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21890, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21906,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21906, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1147,17 +749,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21894, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21910,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21910, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1165,17 +757,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21889, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21905,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21905, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1183,17 +765,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21893, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21909,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21909, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1202,8 +774,7 @@ static void side_friction_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -1213,17 +784,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21891, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21907,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21907, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1231,17 +792,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21895, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21911,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21911, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1249,17 +800,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21888, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21904,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21904, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1267,17 +808,7 @@ static void side_friction_rc_track_s_bend_left(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21892, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21908,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21908, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1299,11 +830,7 @@ static void side_friction_rc_track_s_bend_left(
 
 /** rct2: 0x0077849C */
 static void side_friction_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1315,17 +842,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21896, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21912,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21912, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1333,17 +850,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21900, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21916,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21916, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1351,17 +858,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21899, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21915,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21915, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1369,17 +866,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21903, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21919,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21919, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1398,17 +885,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21897, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21913,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21913, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1416,17 +893,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21901, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21917,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21917, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1434,17 +901,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21898, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21914,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21914, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1452,17 +909,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21902, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21918,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21918, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1471,8 +918,7 @@ static void side_friction_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -1482,17 +928,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21898, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21914,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21914, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1500,17 +936,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21902, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21918,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21918, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1518,17 +944,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21897, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21913,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21913, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1536,17 +952,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21901, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21917,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21917, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1555,8 +961,7 @@ static void side_friction_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -1566,17 +971,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21899, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21915,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21915, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1584,17 +979,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21903, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21919,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21919, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1602,17 +987,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21896, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21912,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21912, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1620,17 +995,7 @@ static void side_friction_rc_track_s_bend_right(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21900, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21916,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21916, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1652,11 +1017,7 @@ static void side_friction_rc_track_s_bend_right(
 
 /** rct2: 0x007784DC */
 static void side_friction_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1668,17 +1029,7 @@ static void side_friction_rc_track_left_quarter_turn_3(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21699, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21711,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21711, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1686,17 +1037,7 @@ static void side_friction_rc_track_left_quarter_turn_3(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21702, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21714,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21714, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1704,17 +1045,7 @@ static void side_friction_rc_track_left_quarter_turn_3(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21705, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21717,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21717, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1722,17 +1053,7 @@ static void side_friction_rc_track_left_quarter_turn_3(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21696, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21708,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21708, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1752,103 +1073,33 @@ static void side_friction_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21698,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21698, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21710,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21710, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21701, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21713,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21713, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21704,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21704, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21716,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21716, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21695,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21695, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21707,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21707, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
             }
@@ -1863,17 +1114,7 @@ static void side_friction_rc_track_left_quarter_turn_3(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21697, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21709,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21709, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1881,17 +1122,7 @@ static void side_friction_rc_track_left_quarter_turn_3(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21700, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21712,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21712, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1899,17 +1130,7 @@ static void side_friction_rc_track_left_quarter_turn_3(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21703, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21715,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21715, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1917,17 +1138,7 @@ static void side_friction_rc_track_left_quarter_turn_3(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21694, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21706,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21706, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -1949,11 +1160,7 @@ static void side_friction_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x007784EC */
 static void side_friction_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -1962,11 +1169,7 @@ static void side_friction_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x007784FC */
 static void side_friction_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1995,11 +1198,7 @@ static void side_friction_rc_track_brakes(
 
 /** rct2: 0x007785DC */
 static void side_friction_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2011,17 +1210,7 @@ static void side_friction_rc_track_left_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21790, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21806,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21806, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2029,17 +1218,7 @@ static void side_friction_rc_track_left_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21794, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21810,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21810, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2047,17 +1226,7 @@ static void side_friction_rc_track_left_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21798, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21814,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21814, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2065,17 +1234,7 @@ static void side_friction_rc_track_left_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21802, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21818,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21818, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2094,17 +1253,7 @@ static void side_friction_rc_track_left_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21791, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21807,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21807, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2112,75 +1261,25 @@ static void side_friction_rc_track_left_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21795, 0, 0, 34, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21811,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21811, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21799,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21799, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21815,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21815, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21803,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21803, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21819,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21819, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2193,88 +1292,28 @@ static void side_friction_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21792,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21792, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21808,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21808, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21796,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21796, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21812,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21812, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21800,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21800, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21816,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21816, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2282,17 +1321,7 @@ static void side_friction_rc_track_left_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21804, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21820,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21820, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2324,103 +1353,33 @@ static void side_friction_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21793,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21793, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21809,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21809, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21797,
-                        0,
-                        0,
-                        16,
-                        18,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21797, 0, 0, 16, 18, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21813,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21813, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21801, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21817,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21817, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21805,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21805, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21821,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21821, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
             }
@@ -2432,11 +1391,7 @@ static void side_friction_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x007785EC */
 static void side_friction_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2448,17 +1403,7 @@ static void side_friction_rc_track_right_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21758, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21774,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21774, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2466,17 +1411,7 @@ static void side_friction_rc_track_right_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21762, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21778,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21778, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2484,17 +1419,7 @@ static void side_friction_rc_track_right_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21766, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21782,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21782, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2502,17 +1427,7 @@ static void side_friction_rc_track_right_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21770, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21786,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21786, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2529,59 +1444,19 @@ static void side_friction_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21759,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21759, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21775,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21775, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21763,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21763, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21779,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21779, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2589,17 +1464,7 @@ static void side_friction_rc_track_right_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21767, 0, 0, 34, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21783,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21783, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2607,17 +1472,7 @@ static void side_friction_rc_track_right_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21771, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21787,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21787, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2632,46 +1487,16 @@ static void side_friction_rc_track_right_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21760, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21776,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21776, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21764,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21764, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21780,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21780, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2679,46 +1504,16 @@ static void side_friction_rc_track_right_eighth_to_diag(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21768, 0, 0, 28, 28, 2, height, 4, 4, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21784,
-                        0,
-                        0,
-                        28,
-                        28,
-                        0,
-                        height,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21784, 0, 0, 28, 28, 0, height, 4, 4,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21772,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21772, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21788,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21788, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2750,103 +1545,33 @@ static void side_friction_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21761,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21761, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21777,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21777, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 21765, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21781,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21781, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21769,
-                        0,
-                        0,
-                        16,
-                        18,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21769, 0, 0, 16, 18, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21785,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21785, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21773,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21773, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 21789,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 21789, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
             }
@@ -2858,11 +1583,7 @@ static void side_friction_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x007785FC */
 static void side_friction_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -2871,11 +1592,7 @@ static void side_friction_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x0077860C */
 static void side_friction_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -2884,11 +1601,7 @@ static void side_friction_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x0077850C */
 static void side_friction_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2900,18 +1613,8 @@ static void side_friction_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21849,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21849, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2921,18 +1624,8 @@ static void side_friction_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21825,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21825, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2946,31 +1639,11 @@ static void side_friction_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21846,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21846, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21850,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21850, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -2990,31 +1663,11 @@ static void side_friction_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21822,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21822, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21826,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21826, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -3044,31 +1697,11 @@ static void side_friction_rc_track_diag_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21848,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21848, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21851,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21851, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -3088,31 +1721,11 @@ static void side_friction_rc_track_diag_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21824,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21824, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21827,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21827, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -3130,18 +1743,8 @@ static void side_friction_rc_track_diag_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21847,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21847, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3151,18 +1754,8 @@ static void side_friction_rc_track_diag_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21823,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21823, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3174,11 +1767,7 @@ static void side_friction_rc_track_diag_flat(
 
 /** rct2: 0x0077853C */
 static void side_friction_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3190,18 +1779,8 @@ static void side_friction_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21867,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21867, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3211,18 +1790,8 @@ static void side_friction_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21843,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21843, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3236,31 +1805,11 @@ static void side_friction_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21864,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21864, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21868,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21868, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -3284,31 +1833,11 @@ static void side_friction_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21840,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21840, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21844,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21844, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -3344,31 +1873,11 @@ static void side_friction_rc_track_diag_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21866,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21866, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21869,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21869, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -3392,31 +1901,11 @@ static void side_friction_rc_track_diag_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21842,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21842, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21845,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21845, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -3436,18 +1925,8 @@ static void side_friction_rc_track_diag_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21865,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21865, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3457,18 +1936,8 @@ static void side_friction_rc_track_diag_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21841,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21841, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3480,11 +1949,7 @@ static void side_friction_rc_track_diag_25_deg_up(
 
 /** rct2: 0x0077851C */
 static void side_friction_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3496,18 +1961,8 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21855,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21855, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3517,18 +1972,8 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21831,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21831, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3542,31 +1987,11 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21852,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21852, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21856,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21856, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -3586,31 +2011,11 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21828,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21828, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21832,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21832, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -3640,31 +2045,11 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21854,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21854, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21857,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21857, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -3684,31 +2069,11 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21830,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21830, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21833,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21833, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -3726,18 +2091,8 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21853,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21853, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3747,18 +2102,8 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21829,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21829, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3770,11 +2115,7 @@ static void side_friction_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x0077852C */
 static void side_friction_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3786,18 +2127,8 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21861,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21861, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3807,18 +2138,8 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21837,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21837, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3832,31 +2153,11 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21858,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21858, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21862,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21862, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -3880,31 +2181,11 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21834,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21834, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21838,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21838, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -3940,31 +2221,11 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21860,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21860, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21863,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21863, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -3988,31 +2249,11 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21836,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21836, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21839,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21839, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -4032,18 +2273,8 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21859,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21859, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -4053,18 +2284,8 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21835,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21835, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -4076,11 +2297,7 @@ static void side_friction_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x0077859C */
 static void side_friction_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4092,18 +2309,8 @@ static void side_friction_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21865,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21865, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -4113,18 +2320,8 @@ static void side_friction_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21841,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21841, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -4138,31 +2335,11 @@ static void side_friction_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21866,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21866, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21869,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21869, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -4186,31 +2363,11 @@ static void side_friction_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21842,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21842, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21845,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21845, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -4246,31 +2403,11 @@ static void side_friction_rc_track_diag_25_deg_down(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21864,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21864, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21868,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21868, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -4294,31 +2431,11 @@ static void side_friction_rc_track_diag_25_deg_down(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21840,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21840, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21844,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21844, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -4338,18 +2455,8 @@ static void side_friction_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21867,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21867, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -4359,18 +2466,8 @@ static void side_friction_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21843,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21843, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -4382,11 +2479,7 @@ static void side_friction_rc_track_diag_25_deg_down(
 
 /** rct2: 0x0077857C */
 static void side_friction_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4398,18 +2491,8 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21859,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21859, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -4419,18 +2502,8 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21835,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21835, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -4442,31 +2515,11 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21860,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21860, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21863,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21863, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -4490,31 +2543,11 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21836,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21836, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21839,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21839, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -4548,31 +2581,11 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21858,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21858, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21862,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21862, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -4596,31 +2609,11 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21834,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21834, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21838,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21838, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -4638,18 +2631,8 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21861,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21861, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -4659,18 +2642,8 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21837,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21837, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -4683,11 +2656,7 @@ static void side_friction_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x0077858C */
 static void side_friction_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4699,18 +2668,8 @@ static void side_friction_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21853,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21853, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -4720,18 +2679,8 @@ static void side_friction_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21829,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21829, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -4745,31 +2694,11 @@ static void side_friction_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21854,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21854, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21857,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21857, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -4789,31 +2718,11 @@ static void side_friction_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21830,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21830, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21833,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21833, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -4843,31 +2752,11 @@ static void side_friction_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21852,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21852, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21856,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21856, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -4887,31 +2776,11 @@ static void side_friction_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21828,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21828, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21832,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21832, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -4929,18 +2798,8 @@ static void side_friction_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21855,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21855, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -4950,18 +2809,8 @@ static void side_friction_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 21831,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 21831, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
diff --git a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp
index dbb2c78eb8..d3fe7d04d0 100644
--- a/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/StandUpRollerCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x008A7114 */
 static void stand_up_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -76,11 +72,7 @@ static void stand_up_rc_track_flat(
 
 /** rct2: 0x008A7384, 0x008A7394, 0x008A73A4 */
 static void stand_up_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -93,33 +85,13 @@ static void stand_up_rc_track_station(
     if (track_element_get_type(tileElement) == TRACK_ELEM_END_STATION)
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-            0,
-            6,
-            32,
-            20,
-            1,
-            height,
-            0,
-            6,
+            session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 6, 32, 20, 1, height, 0, 6,
             height + 3);
     }
     else
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-            0,
-            6,
-            32,
-            20,
-            1,
-            height,
-            0,
-            6,
+            session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 6, 32, 20, 1, height, 0, 6,
             height + 3);
     }
     sub_98196C_rotated(
@@ -133,11 +105,7 @@ static void stand_up_rc_track_station(
 
 /** rct2: 0x008A7124 */
 static void stand_up_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -199,11 +167,7 @@ static void stand_up_rc_track_25_deg_up(
 
 /** rct2: 0x008A7134 */
 static void stand_up_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -269,11 +233,7 @@ static void stand_up_rc_track_60_deg_up(
 
 /** rct2: 0x008A7144 */
 static void stand_up_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -335,11 +295,7 @@ static void stand_up_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x008A7154 */
 static void stand_up_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -413,11 +369,7 @@ static void stand_up_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008A7164 */
 static void stand_up_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -491,11 +443,7 @@ static void stand_up_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A7174 */
 static void stand_up_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -557,11 +505,7 @@ static void stand_up_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x008A7184 */
 static void stand_up_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     stand_up_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -569,11 +513,7 @@ static void stand_up_rc_track_25_deg_down(
 
 /** rct2: 0x008A7194 */
 static void stand_up_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     stand_up_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -581,11 +521,7 @@ static void stand_up_rc_track_60_deg_down(
 
 /** rct2: 0x008A71A4 */
 static void stand_up_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     stand_up_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -593,11 +529,7 @@ static void stand_up_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008A71B4 */
 static void stand_up_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     stand_up_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -605,11 +537,7 @@ static void stand_up_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008A71C4 */
 static void stand_up_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     stand_up_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -617,11 +545,7 @@ static void stand_up_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A71D4 */
 static void stand_up_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     stand_up_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -629,11 +553,7 @@ static void stand_up_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x008A71E4 */
 static void stand_up_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -694,8 +614,7 @@ static void stand_up_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -749,8 +668,7 @@ static void stand_up_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -792,11 +710,7 @@ static void stand_up_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x008A71F4 */
 static void stand_up_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -805,11 +719,7 @@ static void stand_up_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x008A7204 */
 static void stand_up_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -839,11 +749,7 @@ static void stand_up_rc_track_flat_to_left_bank(
 
 /** rct2: 0x008A7214 */
 static void stand_up_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -873,11 +779,7 @@ static void stand_up_rc_track_flat_to_right_bank(
 
 /** rct2: 0x008A7224 */
 static void stand_up_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -907,11 +809,7 @@ static void stand_up_rc_track_left_bank_to_flat(
 
 /** rct2: 0x008A7234 */
 static void stand_up_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -941,11 +839,7 @@ static void stand_up_rc_track_right_bank_to_flat(
 
 /** rct2: 0x008A7244 */
 static void stand_up_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -957,32 +851,12 @@ static void stand_up_rc_track_banked_left_quarter_turn_5(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25464, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25475,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25475, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25469,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25469, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -1015,47 +889,17 @@ static void stand_up_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25468,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25468, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25473,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25473, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25458,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25458, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -1063,8 +907,7 @@ static void stand_up_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -1072,47 +915,17 @@ static void stand_up_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25462,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25462, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25467,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25467, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25472,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25472, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -1132,32 +945,12 @@ static void stand_up_rc_track_banked_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25461,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25461, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25466,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25466, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -1166,17 +959,7 @@ static void stand_up_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25456,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25456, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -1184,8 +967,7 @@ static void stand_up_rc_track_banked_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -1197,34 +979,14 @@ static void stand_up_rc_track_banked_left_quarter_turn_5(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25465,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25465, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25470, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25476,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25476, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -1251,11 +1013,7 @@ static void stand_up_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x008A7254 */
 static void stand_up_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1264,11 +1022,7 @@ static void stand_up_rc_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x008A7264 */
 static void stand_up_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1305,11 +1059,7 @@ static void stand_up_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x008A7274 */
 static void stand_up_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1346,11 +1096,7 @@ static void stand_up_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x008A7284 */
 static void stand_up_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1387,11 +1133,7 @@ static void stand_up_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x008A7294 */
 static void stand_up_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1428,11 +1170,7 @@ static void stand_up_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x008A72A4 */
 static void stand_up_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     stand_up_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1440,11 +1178,7 @@ static void stand_up_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x008A72B4 */
 static void stand_up_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     stand_up_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1452,11 +1186,7 @@ static void stand_up_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x008A72C4 */
 static void stand_up_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     stand_up_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1464,11 +1194,7 @@ static void stand_up_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x008A72D4 */
 static void stand_up_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     stand_up_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1476,11 +1202,7 @@ static void stand_up_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x008A72E4 */
 static void stand_up_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1510,11 +1232,7 @@ static void stand_up_rc_track_left_bank(
 
 /** rct2: 0x008A72F4 */
 static void stand_up_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     stand_up_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1522,11 +1240,7 @@ static void stand_up_rc_track_right_bank(
 
 /** rct2: 0x008A7304 */
 static void stand_up_rc_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1640,8 +1354,7 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -1745,8 +1458,7 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -1816,11 +1528,7 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A7314 */
 static void stand_up_rc_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1934,8 +1642,7 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -2039,8 +1746,7 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -2110,11 +1816,7 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A7324 */
 static void stand_up_rc_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2124,11 +1826,7 @@ static void stand_up_rc_track_left_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A7334 */
 static void stand_up_rc_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -2138,11 +1836,7 @@ static void stand_up_rc_track_right_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A7344 */
 static void stand_up_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2204,8 +1898,7 @@ static void stand_up_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2236,8 +1929,7 @@ static void stand_up_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2279,11 +1971,7 @@ static void stand_up_rc_track_s_bend_left(
 
 /** rct2: 0x008A7354 */
 static void stand_up_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2345,8 +2033,7 @@ static void stand_up_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -2377,8 +2064,7 @@ static void stand_up_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -2420,11 +2106,7 @@ static void stand_up_rc_track_s_bend_right(
 
 /** rct2: 0x008A7364 */
 static void stand_up_rc_track_left_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2458,8 +2140,7 @@ static void stand_up_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 56, 0x20);
             break;
         case 1:
@@ -2494,8 +2175,7 @@ static void stand_up_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 2:
@@ -2546,8 +2226,7 @@ static void stand_up_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 4:
@@ -2580,8 +2259,7 @@ static void stand_up_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 7:
@@ -2640,8 +2318,7 @@ static void stand_up_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 9:
@@ -2678,8 +2355,7 @@ static void stand_up_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 56, 0x20);
             break;
     }
@@ -2687,11 +2363,7 @@ static void stand_up_rc_track_left_vertical_loop(
 
 /** rct2: 0x008A7374 */
 static void stand_up_rc_track_right_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2916,11 +2588,7 @@ static void stand_up_rc_track_right_vertical_loop(
 
 /** rct2: 0x008A73B4 */
 static void stand_up_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3020,11 +2688,7 @@ static void stand_up_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x008A73C4 */
 static void stand_up_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3033,11 +2697,7 @@ static void stand_up_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x008A73D4 */
 static void stand_up_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3049,32 +2709,12 @@ static void stand_up_rc_track_left_quarter_turn_3_bank(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25526, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25533,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25533, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25529,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25529, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -3103,62 +2743,22 @@ static void stand_up_rc_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25525,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25525, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25528,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25528, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25531,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25531, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25522,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25522, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -3175,34 +2775,14 @@ static void stand_up_rc_track_left_quarter_turn_3_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25527,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25527, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25530, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25534,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25534, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -3229,11 +2809,7 @@ static void stand_up_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x008A73E4 */
 static void stand_up_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3242,11 +2818,7 @@ static void stand_up_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x008A73F4 */
 static void stand_up_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3381,11 +2953,7 @@ static void stand_up_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A7404 */
 static void stand_up_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3532,11 +3100,7 @@ static void stand_up_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A7414 */
 static void stand_up_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3546,11 +3110,7 @@ static void stand_up_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A7424 */
 static void stand_up_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -3560,11 +3120,7 @@ static void stand_up_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A7434 */
 static void stand_up_rc_track_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3646,17 +3202,7 @@ static void stand_up_rc_track_half_loop_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25588,
-                        16,
-                        16,
-                        2,
-                        16,
-                        119,
-                        height,
-                        15,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25588, 16, 16, 2, 16, 119, height, 15, 6,
                         height);
                     break;
             }
@@ -3664,8 +3210,7 @@ static void stand_up_rc_track_half_loop_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 168, 0x20);
             break;
         case 3:
@@ -3701,11 +3246,7 @@ static void stand_up_rc_track_half_loop_up(
 
 /** rct2: 0x008A7444 */
 static void stand_up_rc_track_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     stand_up_rc_track_half_loop_up(session, rideIndex, 3 - trackSequence, direction, height, tileElement);
@@ -3713,11 +3254,7 @@ static void stand_up_rc_track_half_loop_down(
 
 /** rct2: 0x008A7454 */
 static void stand_up_rc_track_left_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3727,62 +3264,22 @@ static void stand_up_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25591,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25591, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25594,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25594, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25597,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25597, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25600,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25600, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
             }
@@ -3800,62 +3297,22 @@ static void stand_up_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25592,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25592, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25595,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25595, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25598,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25598, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25601,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25601, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
             }
@@ -3867,71 +3324,29 @@ static void stand_up_rc_track_left_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25593,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25593, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25596,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25596, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25599,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25599, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25602,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25602, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 35, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3951,11 +3366,7 @@ static void stand_up_rc_track_left_corkscrew_up(
 
 /** rct2: 0x008A7464 */
 static void stand_up_rc_track_right_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3965,62 +3376,22 @@ static void stand_up_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25603,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25603, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25606,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25606, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25609,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25609, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25612,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25612, 0, 0, 32, 20, 3, height, 0, 6,
                         height + 4);
                     break;
             }
@@ -4030,10 +3401,8 @@ static void stand_up_rc_track_right_corkscrew_up(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 1:
@@ -4041,62 +3410,22 @@ static void stand_up_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25604,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25604, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25607,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25607, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25610,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25610, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25613,
-                        0,
-                        0,
-                        20,
-                        20,
-                        3,
-                        height,
-                        6,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25613, 0, 0, 20, 20, 3, height, 6, 6,
                         height + 10);
                     break;
             }
@@ -4108,71 +3437,29 @@ static void stand_up_rc_track_right_corkscrew_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25605,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25605, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25608,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25608, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25611,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25611, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25614,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25614, 0, 0, 20, 32, 3, height, 6, 0,
                         height + 24);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 35, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -4192,11 +3479,7 @@ static void stand_up_rc_track_right_corkscrew_up(
 
 /** rct2: 0x008A7474 */
 static void stand_up_rc_track_left_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     stand_up_rc_track_right_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction + 1) & 3, height, tileElement);
@@ -4204,11 +3487,7 @@ static void stand_up_rc_track_left_corkscrew_down(
 
 /** rct2: 0x008A7484 */
 static void stand_up_rc_track_right_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     stand_up_rc_track_left_corkscrew_up(session, rideIndex, 2 - trackSequence, (direction - 1) & 3, height, tileElement);
@@ -4216,11 +3495,7 @@ static void stand_up_rc_track_right_corkscrew_down(
 
 /** rct2: 0x008A7734 */
 static void stand_up_rc_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4232,32 +3507,12 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25844, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25851,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25851, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25847,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25847, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -4275,10 +3530,8 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -4289,62 +3542,22 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25843,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25843, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25846,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25846, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25849,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25849, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25840,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25840, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -4361,34 +3574,14 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25845,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25845, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25848, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25852,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25852, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4407,10 +3600,8 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -4424,32 +3615,12 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25844, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25851,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25851, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25847,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25847, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4468,10 +3639,8 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -4482,62 +3651,22 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25840,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25840, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25843,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25843, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25846,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25846, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25849,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25849, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4558,34 +3687,14 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25845,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25845, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25848, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25852,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25852, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -4595,10 +3704,8 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -4606,11 +3713,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_small(
 
 /** rct2: 0x008A7744 */
 static void stand_up_rc_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4628,34 +3731,14 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25831,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25831, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25834, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25838,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25838, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -4665,10 +3748,8 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -4679,62 +3760,22 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25826,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25826, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25829,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25829, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25832,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25832, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25835,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25835, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -4753,32 +3794,12 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25830, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25837,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25837, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25833,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25833, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4797,10 +3818,8 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -4812,34 +3831,14 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25831,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25831, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25834, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25838,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25838, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -4858,10 +3857,8 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -4872,62 +3869,22 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25829,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25829, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25832,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25832, 0, 0, 16, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25835,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25835, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25826,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25826, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
             }
@@ -4942,32 +3899,12 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25830, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25837,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25837, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25833,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25833, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -4985,10 +3922,8 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -4996,11 +3931,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_small(
 
 /** rct2: 0x008A7754 */
 static void stand_up_rc_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -5015,11 +3946,7 @@ static void stand_up_rc_track_left_half_banked_helix_down_small(
 
 /** rct2: 0x008A7764 */
 static void stand_up_rc_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -5034,11 +3961,7 @@ static void stand_up_rc_track_right_half_banked_helix_down_small(
 
 /** rct2: 0x008A76F4 */
 static void stand_up_rc_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5050,32 +3973,12 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25812, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25823,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25823, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25817,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25817, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -5093,10 +3996,8 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -5111,47 +4012,17 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25816,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25816, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25821,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25821, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25806,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25806, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5159,8 +4030,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -5168,47 +4038,17 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25810,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25810, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25815,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25815, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25820,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25820, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -5228,32 +4068,12 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25809,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25809, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25814,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25814, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -5262,17 +4082,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25804,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25804, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -5280,8 +4090,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -5293,34 +4102,14 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25813,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25813, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25818, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25824,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25824, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -5339,10 +4128,8 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -5356,32 +4143,12 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25812, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25823,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25823, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25817,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25817, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -5400,10 +4167,8 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -5414,17 +4179,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25806,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25806, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -5433,32 +4188,12 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25816,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25816, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25821,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25821, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -5466,8 +4201,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -5479,47 +4213,17 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25810,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25810, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25815,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25815, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25820,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25820, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5535,47 +4239,17 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25804,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25804, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25809,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25809, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25814,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25814, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -5587,8 +4261,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -5604,34 +4277,14 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25813,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25813, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25818, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25824,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25824, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -5641,10 +4294,8 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -5652,11 +4303,7 @@ static void stand_up_rc_track_left_half_banked_helix_up_large(
 
 /** rct2: 0x008A7704 */
 static void stand_up_rc_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5674,34 +4321,14 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25791,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25791, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25796, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25802,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25802, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -5711,10 +4338,8 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -5725,47 +4350,17 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25782,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25782, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25787,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25787, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25792,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25792, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -5777,8 +4372,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -5790,47 +4384,17 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25788,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25788, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25793,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25793, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25798,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25798, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -5846,17 +4410,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25784,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25784, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -5865,32 +4419,12 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25794,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25794, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25799,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25799, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -5898,8 +4432,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -5913,32 +4446,12 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25790, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25801,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25801, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25795,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25795, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -5957,10 +4470,8 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -5972,34 +4483,14 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25791,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25791, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25796, 0, 0, 20, 32, 3, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25802,
-                        0,
-                        0,
-                        1,
-                        32,
-                        26,
-                        height,
-                        27,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25802, 0, 0, 1, 32, 26, height, 27, 0,
                         height);
                     break;
                 case 3:
@@ -6018,10 +4509,8 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -6032,32 +4521,12 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25787,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25787, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25792,
-                        0,
-                        0,
-                        16,
-                        32,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25792, 0, 0, 16, 32, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
@@ -6066,17 +4535,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25782,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25782, 0, 0, 16, 32, 3, height, 16, 0,
                         height);
                     break;
             }
@@ -6084,8 +4543,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -6093,47 +4551,17 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25788,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25788, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25793,
-                        0,
-                        0,
-                        16,
-                        16,
-                        1,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25793, 0, 0, 16, 16, 1, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25798,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25798, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -6157,47 +4585,17 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25794,
-                        0,
-                        0,
-                        32,
-                        16,
-                        1,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25794, 0, 0, 32, 16, 1, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25799,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25799, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25784,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25784, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -6205,8 +4603,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -6216,32 +4613,12 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                     sub_98197C_rotated(
                         session, direction, session->TrackColours[SCHEME_TRACK] | 25790, 0, 0, 32, 20, 3, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25801,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25801, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25795,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25795, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -6259,10 +4636,8 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
                 paint_util_push_tunnel_rotated(session, direction, height + 8, TUNNEL_0);
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -6270,11 +4645,7 @@ static void stand_up_rc_track_right_half_banked_helix_up_large(
 
 /** rct2: 0x008A7714 */
 static void stand_up_rc_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -6289,11 +4660,7 @@ static void stand_up_rc_track_left_half_banked_helix_down_large(
 
 /** rct2: 0x008A7724 */
 static void stand_up_rc_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -6308,11 +4675,7 @@ static void stand_up_rc_track_right_half_banked_helix_down_large(
 
 /** rct2: 0x008A7494 */
 static void stand_up_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -6338,11 +4701,7 @@ static void stand_up_rc_track_brakes(
 
 /** rct2: 0x008A74A4 */
 static void stand_up_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -6384,11 +4743,7 @@ static void stand_up_rc_track_on_ride_photo(
 
 /** rct2: 0x008A74B4 */
 static void stand_up_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6435,32 +4790,12 @@ static void stand_up_rc_track_left_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25652,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25652, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25656,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25656, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -6468,8 +4803,7 @@ static void stand_up_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -6477,47 +4811,17 @@ static void stand_up_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25645,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25645, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25649,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25649, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25653,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25653, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -6526,10 +4830,8 @@ static void stand_up_rc_track_left_eighth_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -6542,34 +4844,14 @@ static void stand_up_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25646,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25646, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25650,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25650, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6582,17 +4864,7 @@ static void stand_up_rc_track_left_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25658,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25658, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6602,8 +4874,7 @@ static void stand_up_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -6611,11 +4882,7 @@ static void stand_up_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x008A74C4 */
 static void stand_up_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6654,32 +4921,12 @@ static void stand_up_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25628,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25628, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25632,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25632, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -6695,8 +4942,7 @@ static void stand_up_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -6708,17 +4954,7 @@ static void stand_up_rc_track_right_eighth_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25633,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25633, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
@@ -6727,25 +4963,13 @@ static void stand_up_rc_track_right_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25641,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25641, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -6758,17 +4982,7 @@ static void stand_up_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25630,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25630, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6781,34 +4995,14 @@ static void stand_up_rc_track_right_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25638,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25638, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25642,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25642, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -6818,8 +5012,7 @@ static void stand_up_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -6827,11 +5020,7 @@ static void stand_up_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x008A74D4 */
 static void stand_up_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -6840,11 +5029,7 @@ static void stand_up_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008A74E4 */
 static void stand_up_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -6853,11 +5038,7 @@ static void stand_up_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008A76A4 */
 static void stand_up_rc_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6867,32 +5048,12 @@ static void stand_up_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25675,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25675, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25679,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25679, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 2:
@@ -6922,47 +5083,17 @@ static void stand_up_rc_track_left_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25680,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25680, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25684,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25684, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25688,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25688, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -6970,8 +5101,7 @@ static void stand_up_rc_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -6979,47 +5109,17 @@ static void stand_up_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25677,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25677, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25681,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25681, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25685,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25685, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -7028,10 +5128,8 @@ static void stand_up_rc_track_left_eighth_bank_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -7044,34 +5142,14 @@ static void stand_up_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25678,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25678, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25682,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25682, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7084,17 +5162,7 @@ static void stand_up_rc_track_left_eighth_bank_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25690,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25690, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7104,8 +5172,7 @@ static void stand_up_rc_track_left_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -7113,11 +5180,7 @@ static void stand_up_rc_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x008A76B4 */
 static void stand_up_rc_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7135,32 +5198,12 @@ static void stand_up_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25667,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25667, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25671,
-                        0,
-                        0,
-                        32,
-                        1,
-                        26,
-                        height,
-                        0,
-                        27,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25671, 0, 0, 32, 1, 26, height, 0, 27,
                         height);
                     break;
             }
@@ -7182,32 +5225,12 @@ static void stand_up_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25664,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25664, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25668,
-                        0,
-                        0,
-                        34,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25668, 0, 0, 34, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
@@ -7219,8 +5242,7 @@ static void stand_up_rc_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -7232,55 +5254,23 @@ static void stand_up_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25665,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25665, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25669,
-                        0,
-                        0,
-                        28,
-                        28,
-                        0,
-                        height,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25669, 0, 0, 28, 28, 0, height, 4, 4,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25673,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25673, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -7293,17 +5283,7 @@ static void stand_up_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25662,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25662, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7316,34 +5296,14 @@ static void stand_up_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25670,
-                        0,
-                        0,
-                        16,
-                        18,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25670, 0, 0, 16, 18, 0, height, 0, 16,
                         height + 27);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25674,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25674, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -7353,8 +5313,7 @@ static void stand_up_rc_track_right_eighth_bank_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -7362,11 +5321,7 @@ static void stand_up_rc_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x008A76C4 */
 static void stand_up_rc_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -7375,11 +5330,7 @@ static void stand_up_rc_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008A76D4 */
 static void stand_up_rc_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -7388,11 +5339,7 @@ static void stand_up_rc_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008A74F4 */
 static void stand_up_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7404,18 +5351,8 @@ static void stand_up_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25756,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25756, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7425,18 +5362,8 @@ static void stand_up_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25694,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25694, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7451,18 +5378,8 @@ static void stand_up_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25753,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25753, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7472,18 +5389,8 @@ static void stand_up_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25691,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25691, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7498,18 +5405,8 @@ static void stand_up_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25755,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25755, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7519,18 +5416,8 @@ static void stand_up_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25693,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25693, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7549,18 +5436,8 @@ static void stand_up_rc_track_diag_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25754,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25754, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7584,18 +5461,8 @@ static void stand_up_rc_track_diag_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25692,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25692, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7618,11 +5485,7 @@ static void stand_up_rc_track_diag_flat(
 
 /** rct2: 0x008A7524 */
 static void stand_up_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7634,18 +5497,8 @@ static void stand_up_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25768,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25768, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7655,18 +5508,8 @@ static void stand_up_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25706,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25706, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7681,18 +5524,8 @@ static void stand_up_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25765,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25765, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7702,18 +5535,8 @@ static void stand_up_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25703,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25703, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7728,18 +5551,8 @@ static void stand_up_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25767,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25767, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7749,18 +5562,8 @@ static void stand_up_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25705,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25705, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7779,18 +5582,8 @@ static void stand_up_rc_track_diag_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25766,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25766, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7814,18 +5607,8 @@ static void stand_up_rc_track_diag_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25704,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25704, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -7848,11 +5631,7 @@ static void stand_up_rc_track_diag_25_deg_up(
 
 /** rct2: 0x008A7584 */
 static void stand_up_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7864,18 +5643,8 @@ static void stand_up_rc_track_diag_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25780,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25780, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7885,18 +5654,8 @@ static void stand_up_rc_track_diag_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25718,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25718, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7911,18 +5670,8 @@ static void stand_up_rc_track_diag_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25777,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25777, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7932,18 +5681,8 @@ static void stand_up_rc_track_diag_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25715,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25715, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7958,18 +5697,8 @@ static void stand_up_rc_track_diag_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25779,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25779, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -7979,18 +5708,8 @@ static void stand_up_rc_track_diag_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25717,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25717, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8009,18 +5728,8 @@ static void stand_up_rc_track_diag_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25778,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25778, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 36, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8044,18 +5753,8 @@ static void stand_up_rc_track_diag_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25716,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25716, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 36, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8078,11 +5777,7 @@ static void stand_up_rc_track_diag_60_deg_up(
 
 /** rct2: 0x008A7504 */
 static void stand_up_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8094,18 +5789,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25760,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25760, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8115,18 +5800,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25698,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25698, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8141,18 +5816,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25757,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25757, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8162,18 +5827,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25695,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25695, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8188,18 +5843,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25759,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25759, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8209,18 +5854,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25697,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25697, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8239,18 +5874,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25758,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25758, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8274,18 +5899,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25696,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25696, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8308,11 +5923,7 @@ static void stand_up_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008A7564 */
 static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8324,18 +5935,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25772,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25772, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8345,18 +5946,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25710,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25710, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8371,18 +5962,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25769,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25769, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8392,18 +5973,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25707,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25707, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8418,18 +5989,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25771,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25771, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8439,18 +6000,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25709,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25709, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8469,18 +6020,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25770,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25770, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8504,18 +6045,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25708,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25708, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 16, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8538,11 +6069,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008A7574 */
 static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8554,18 +6081,8 @@ static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25776,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25776, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8575,18 +6092,8 @@ static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25714,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25714, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8601,18 +6108,8 @@ static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25773,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25773, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8622,18 +6119,8 @@ static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25711,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25711, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8648,18 +6135,8 @@ static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25775,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25775, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8669,18 +6146,8 @@ static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25713,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25713, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8699,17 +6166,7 @@ static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25774,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25774, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 21, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8734,17 +6191,7 @@ static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25712,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25712, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 21, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -8768,11 +6215,7 @@ static void stand_up_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A7514 */
 static void stand_up_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8784,18 +6227,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25764,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25764, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8805,18 +6238,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25702,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25702, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8831,18 +6254,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25761,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25761, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8852,18 +6265,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25699,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25699, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8878,18 +6281,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25763,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25763, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8899,18 +6292,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25701,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25701, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -8929,18 +6312,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25762,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25762, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8964,18 +6337,8 @@ static void stand_up_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25700,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25700, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -8998,11 +6361,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008A7554 */
 static void stand_up_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9014,18 +6373,8 @@ static void stand_up_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25766,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25766, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9035,18 +6384,8 @@ static void stand_up_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25704,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25704, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9061,18 +6400,8 @@ static void stand_up_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25767,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25767, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9082,18 +6411,8 @@ static void stand_up_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25705,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25705, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9108,18 +6427,8 @@ static void stand_up_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25765,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25765, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9129,18 +6438,8 @@ static void stand_up_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25703,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25703, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9159,18 +6458,8 @@ static void stand_up_rc_track_diag_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25768,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25768, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9194,18 +6483,8 @@ static void stand_up_rc_track_diag_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25706,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25706, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9228,11 +6507,7 @@ static void stand_up_rc_track_diag_25_deg_down(
 
 /** rct2: 0x008A75B4 */
 static void stand_up_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9244,18 +6519,8 @@ static void stand_up_rc_track_diag_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25778,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25778, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9265,18 +6530,8 @@ static void stand_up_rc_track_diag_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25716,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25716, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9291,18 +6546,8 @@ static void stand_up_rc_track_diag_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25779,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25779, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9312,18 +6557,8 @@ static void stand_up_rc_track_diag_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25717,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25717, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9338,18 +6573,8 @@ static void stand_up_rc_track_diag_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25777,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25777, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9359,18 +6584,8 @@ static void stand_up_rc_track_diag_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25715,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25715, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9389,18 +6604,8 @@ static void stand_up_rc_track_diag_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25780,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25780, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 28, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9424,18 +6629,8 @@ static void stand_up_rc_track_diag_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25718,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25718, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 28, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9458,11 +6653,7 @@ static void stand_up_rc_track_diag_60_deg_down(
 
 /** rct2: 0x008A7534 */
 static void stand_up_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9474,18 +6665,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25762,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25762, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9495,18 +6676,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25700,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25700, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9520,18 +6691,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25763,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25763, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9541,18 +6702,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25701,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25701, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9566,18 +6717,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25761,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25761, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9587,18 +6728,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25699,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25699, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9616,18 +6747,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25764,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25764, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9651,18 +6772,8 @@ static void stand_up_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25702,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25702, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9686,11 +6797,7 @@ static void stand_up_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008A7594 */
 static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9702,17 +6809,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25774,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25774, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
@@ -9723,17 +6820,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25712,
-                            -16,
-                            -16,
-                            16,
-                            16,
-                            3,
-                            height,
-                            0,
-                            0,
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25712, -16, -16, 16, 16, 3, height, 0, 0,
                             height);
                         break;
                 }
@@ -9749,18 +6836,8 @@ static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25775,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25775, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9770,18 +6847,8 @@ static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25713,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25713, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9796,18 +6863,8 @@ static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25773,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25773, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9817,18 +6874,8 @@ static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25711,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25711, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9847,18 +6894,8 @@ static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25776,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25776, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 17, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9882,18 +6919,8 @@ static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25714,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25714, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 17, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -9916,11 +6943,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008A75A4 */
 static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -9932,18 +6955,8 @@ static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25770,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25770, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9953,18 +6966,8 @@ static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25708,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25708, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -9979,18 +6982,8 @@ static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25771,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25771, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10000,18 +6993,8 @@ static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25709,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25709, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10026,18 +7009,8 @@ static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25769,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25769, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10047,18 +7020,8 @@ static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25707,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25707, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10077,18 +7040,8 @@ static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25772,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25772, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10112,18 +7065,8 @@ static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25710,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25710, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 8, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10146,11 +7089,7 @@ static void stand_up_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A7544 */
 static void stand_up_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10162,18 +7101,8 @@ static void stand_up_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25758,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25758, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10183,18 +7112,8 @@ static void stand_up_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25696,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25696, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10209,18 +7128,8 @@ static void stand_up_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25759,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25759, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10230,18 +7139,8 @@ static void stand_up_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25697,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25697, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10256,18 +7155,8 @@ static void stand_up_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25757,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25757, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10277,18 +7166,8 @@ static void stand_up_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25695,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25695, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -10307,18 +7186,8 @@ static void stand_up_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25760,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25760, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10342,18 +7211,8 @@ static void stand_up_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 25698,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 25698, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -10376,11 +7235,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x008A75E4 */
 static void stand_up_rc_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10390,17 +7245,7 @@ static void stand_up_rc_track_diag_flat_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25726,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25726, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10413,30 +7258,10 @@ static void stand_up_rc_track_diag_flat_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25723,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25723, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25727,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25727, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -10449,17 +7274,7 @@ static void stand_up_rc_track_diag_flat_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25725,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25725, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10476,17 +7291,7 @@ static void stand_up_rc_track_diag_flat_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25724,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25724, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10509,11 +7314,7 @@ static void stand_up_rc_track_diag_flat_to_left_bank(
 
 /** rct2: 0x008A75F4 */
 static void stand_up_rc_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10523,17 +7324,7 @@ static void stand_up_rc_track_diag_flat_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25731,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25731, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10546,17 +7337,7 @@ static void stand_up_rc_track_diag_flat_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25728,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25728, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10569,30 +7350,10 @@ static void stand_up_rc_track_diag_flat_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25730,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25730, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25732,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25732, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -10609,17 +7370,7 @@ static void stand_up_rc_track_diag_flat_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25729,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25729, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10642,11 +7393,7 @@ static void stand_up_rc_track_diag_flat_to_right_bank(
 
 /** rct2: 0x008A7604 */
 static void stand_up_rc_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10656,17 +7403,7 @@ static void stand_up_rc_track_diag_left_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25729,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25729, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10679,30 +7416,10 @@ static void stand_up_rc_track_diag_left_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25730,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25730, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25732,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25732, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -10715,17 +7432,7 @@ static void stand_up_rc_track_diag_left_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25728,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25728, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10742,17 +7449,7 @@ static void stand_up_rc_track_diag_left_bank_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25731,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25731, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10775,11 +7472,7 @@ static void stand_up_rc_track_diag_left_bank_to_flat(
 
 /** rct2: 0x008A7614 */
 static void stand_up_rc_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10789,17 +7482,7 @@ static void stand_up_rc_track_diag_right_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25724,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25724, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10812,17 +7495,7 @@ static void stand_up_rc_track_diag_right_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25725,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25725, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10835,30 +7508,10 @@ static void stand_up_rc_track_diag_right_bank_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25723,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25723, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25727,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25727, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -10875,17 +7528,7 @@ static void stand_up_rc_track_diag_right_bank_to_flat(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25726,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25726, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -10908,11 +7551,7 @@ static void stand_up_rc_track_diag_right_bank_to_flat(
 
 /** rct2: 0x008A7644 */
 static void stand_up_rc_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10922,17 +7561,7 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25746,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25746, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -10945,30 +7574,10 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25743,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25743, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25747,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25747, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -10981,17 +7590,7 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25745,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25745, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11008,17 +7607,7 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25744,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25744, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11041,11 +7630,7 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x008A7654 */
 static void stand_up_rc_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11055,17 +7640,7 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25751,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25751, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11078,17 +7653,7 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25748,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25748, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11101,30 +7666,10 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25750,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25750, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25752,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25752, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11141,17 +7686,7 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_up(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25749,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25749, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11174,11 +7709,7 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x008A7624 */
 static void stand_up_rc_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11188,17 +7719,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25736,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25736, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11211,30 +7732,10 @@ static void stand_up_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25733,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25733, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25737,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25737, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11247,17 +7748,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25735,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25735, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11274,17 +7765,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25734,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25734, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11307,11 +7788,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x008A7634 */
 static void stand_up_rc_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11321,17 +7798,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25741,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25741, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11344,17 +7811,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25738,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25738, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11367,30 +7824,10 @@ static void stand_up_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25740,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25740, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25742,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25742, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11407,17 +7844,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25739,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25739, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11440,11 +7867,7 @@ static void stand_up_rc_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x008A7664 */
 static void stand_up_rc_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11454,17 +7877,7 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25739,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25739, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11476,30 +7889,10 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25740,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25740, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25742,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25742, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11511,17 +7904,7 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25738,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25738, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11537,17 +7920,7 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25741,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25741, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11571,11 +7944,7 @@ static void stand_up_rc_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x008A7674 */
 static void stand_up_rc_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11585,17 +7954,7 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25734,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25734, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11607,17 +7966,7 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25735,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25735, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11629,30 +7978,10 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16676,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16676, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 16680,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 16680, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11668,17 +7997,7 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_down(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25736,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25736, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11702,11 +8021,7 @@ static void stand_up_rc_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x008A7684 */
 static void stand_up_rc_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11716,17 +8031,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25749,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25749, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11739,30 +8044,10 @@ static void stand_up_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25750,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25750, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25752,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25752, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11775,17 +8060,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25748,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25748, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11802,17 +8077,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25751,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25751, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11835,11 +8100,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x008A7694 */
 static void stand_up_rc_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11849,17 +8110,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25744,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25744, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11872,17 +8123,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25745,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25745, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -11895,30 +8136,10 @@ static void stand_up_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25743,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25743, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25747,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25747, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     break;
             }
@@ -11935,17 +8156,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25746,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25746, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_b_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -11968,11 +8179,7 @@ static void stand_up_rc_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x008A75C4 */
 static void stand_up_rc_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11982,17 +8189,7 @@ static void stand_up_rc_track_diag_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25722,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25722, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12005,17 +8202,7 @@ static void stand_up_rc_track_diag_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25719,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25719, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -12028,17 +8215,7 @@ static void stand_up_rc_track_diag_left_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25721,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25721, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12055,17 +8232,7 @@ static void stand_up_rc_track_diag_left_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25720,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25720, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12088,11 +8255,7 @@ static void stand_up_rc_track_diag_left_bank(
 
 /** rct2: 0x008A75D4 */
 static void stand_up_rc_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12102,17 +8265,7 @@ static void stand_up_rc_track_diag_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25720,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25720, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12125,17 +8278,7 @@ static void stand_up_rc_track_diag_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25721,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25721, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     break;
             }
@@ -12148,17 +8291,7 @@ static void stand_up_rc_track_diag_right_bank(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25719,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25719, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     break;
             }
@@ -12175,17 +8308,7 @@ static void stand_up_rc_track_diag_right_bank(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25722,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25722, -16, -16, 32, 32, 3, height, -16, -16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_TUBES, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -12208,11 +8331,7 @@ static void stand_up_rc_track_diag_right_bank(
 
 /** rct2: 0x008A76E4 */
 static void stand_up_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
diff --git a/src/openrct2/ride/coaster/Steeplechase.cpp b/src/openrct2/ride/coaster/Steeplechase.cpp
index 2e7174906a..1d37ca183b 100644
--- a/src/openrct2/ride/coaster/Steeplechase.cpp
+++ b/src/openrct2/ride/coaster/Steeplechase.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x008A59A8 */
 static void steeplechase_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -71,11 +67,7 @@ static void steeplechase_track_flat(
 }
 
 static void steeplechase_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -86,30 +78,10 @@ static void steeplechase_track_station(
     };
 
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][1] | session->TrackColours[SCHEME_MISC],
-        0,
-        0,
-        32,
-        28,
-        3,
-        height - 2,
-        0,
-        2,
+        session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 28, 3, height - 2, 0, 2,
         height);
     sub_98199C_rotated(
-        session,
-        direction,
-        imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-        0,
-        6,
-        32,
-        20,
-        3,
-        height,
-        0,
-        0,
+        session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 6, 32, 20, 3, height, 0, 0,
         height);
     track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 3);
     track_paint_util_draw_station(session, rideIndex, direction, height, tileElement);
@@ -120,11 +92,7 @@ static void steeplechase_track_station(
 
 /** rct2: 0x008A59B8 */
 static void steeplechase_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -194,11 +162,7 @@ static void steeplechase_track_25_deg_up(
 
 /** rct2: 0x008A59C8 */
 static void steeplechase_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -268,11 +232,7 @@ static void steeplechase_track_flat_to_25_deg_up(
 
 /** rct2: 0x008A59D8 */
 static void steeplechase_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -342,11 +302,7 @@ static void steeplechase_track_25_deg_up_to_flat(
 
 /** rct2: 0x008A59E8 */
 static void steeplechase_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     steeplechase_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -354,11 +310,7 @@ static void steeplechase_track_25_deg_down(
 
 /** rct2: 0x008A59F8 */
 static void steeplechase_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     steeplechase_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -366,11 +318,7 @@ static void steeplechase_track_flat_to_25_deg_down(
 
 /** rct2: 0x008A5A08 */
 static void steeplechase_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     steeplechase_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -378,11 +326,7 @@ static void steeplechase_track_25_deg_down_to_flat(
 
 /** rct2: 0x008A5A18 */
 static void steeplechase_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -450,8 +394,7 @@ static void steeplechase_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -505,8 +448,7 @@ static void steeplechase_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -555,11 +497,7 @@ static void steeplechase_track_left_quarter_turn_5(
 
 /** rct2: 0x008A5A28 */
 static void steeplechase_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -568,11 +506,7 @@ static void steeplechase_track_right_quarter_turn_5(
 
 /** rct2: 0x008A5A38 */
 static void steeplechase_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -641,8 +575,7 @@ static void steeplechase_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -673,8 +606,7 @@ static void steeplechase_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -723,11 +655,7 @@ static void steeplechase_track_s_bend_left(
 
 /** rct2: 0x008A5A48 */
 static void steeplechase_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -796,8 +724,7 @@ static void steeplechase_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -828,8 +755,7 @@ static void steeplechase_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -878,11 +804,7 @@ static void steeplechase_track_s_bend_right(
 
 /** rct2: 0x008A5A88 */
 static void steeplechase_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -996,11 +918,7 @@ static void steeplechase_track_left_quarter_turn_3(
 
 /** rct2: 0x008A5A98 */
 static void steeplechase_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -1009,11 +927,7 @@ static void steeplechase_track_right_quarter_turn_3(
 
 /** rct2: 0x008A5AA8 */
 static void steeplechase_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1038,11 +952,7 @@ static void steeplechase_track_brakes(
 
 /** rct2: 0x008A5AD8 */
 static void steeplechase_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1096,32 +1006,12 @@ static void steeplechase_track_left_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28734,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28734, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28738,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28738, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
             }
@@ -1129,8 +1019,7 @@ static void steeplechase_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -1138,47 +1027,17 @@ static void steeplechase_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28727,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28727, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28731,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28731, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28735,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28735, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 3:
@@ -1187,10 +1046,8 @@ static void steeplechase_track_left_eighth_to_diag(
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -1203,34 +1060,14 @@ static void steeplechase_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28728,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28728, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_STICK, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28732,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28732, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_STICK_ALT, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -1243,17 +1080,7 @@ static void steeplechase_track_left_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28740,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28740, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_STICK_ALT, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -1263,8 +1090,7 @@ static void steeplechase_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -1272,11 +1098,7 @@ static void steeplechase_track_left_eighth_to_diag(
 
 /** rct2: 0x008A5AE8 */
 static void steeplechase_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1322,32 +1144,12 @@ static void steeplechase_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28710,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28710, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28714,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28714, 0, 0, 32, 16, 3, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -1363,8 +1165,7 @@ static void steeplechase_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -1376,17 +1177,7 @@ static void steeplechase_track_right_eighth_to_diag(
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28715,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28715, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     break;
                 case 2:
@@ -1395,25 +1186,13 @@ static void steeplechase_track_right_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28723,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28723, 0, 0, 16, 16, 3, height, 0, 16,
                         height);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -1426,17 +1205,7 @@ static void steeplechase_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28712,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28712, 0, 0, 16, 16, 3, height, 16, 0,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_STICK, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -1449,34 +1218,14 @@ static void steeplechase_track_right_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28720,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28720, 0, 0, 16, 18, 3, height, 0, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_STICK, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 28724,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 28724, 0, 0, 16, 16, 3, height, 16, 16,
                         height);
                     metal_a_supports_paint_setup(
                         session, METAL_SUPPORTS_STICK_ALT, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
@@ -1486,8 +1235,7 @@ static void steeplechase_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -1495,11 +1243,7 @@ static void steeplechase_track_right_eighth_to_diag(
 
 /** rct2: 0x008A5AF8 */
 static void steeplechase_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -1508,11 +1252,7 @@ static void steeplechase_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008A5B08 */
 static void steeplechase_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -1521,11 +1261,7 @@ static void steeplechase_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008A5AC8 */
 static void steeplechase_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1537,18 +1273,8 @@ static void steeplechase_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28760,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28760, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -1558,18 +1284,8 @@ static void steeplechase_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28744,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28744, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -1584,18 +1300,8 @@ static void steeplechase_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28757,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28757, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -1605,18 +1311,8 @@ static void steeplechase_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28741,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28741, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -1631,18 +1327,8 @@ static void steeplechase_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28759,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28759, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -1652,18 +1338,8 @@ static void steeplechase_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28743,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28743, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -1682,18 +1358,8 @@ static void steeplechase_track_diag_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28758,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28758, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -1717,18 +1383,8 @@ static void steeplechase_track_diag_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28742,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28742, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_a_supports_paint_setup(
                             session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -1751,11 +1407,7 @@ static void steeplechase_track_diag_flat(
 
 /** rct2: 0x008A5B38 */
 static void steeplechase_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1767,18 +1419,8 @@ static void steeplechase_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28772,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28772, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -1788,18 +1430,8 @@ static void steeplechase_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28756,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28756, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -1814,18 +1446,8 @@ static void steeplechase_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28769,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28769, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -1835,18 +1457,8 @@ static void steeplechase_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28753,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28753, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -1861,18 +1473,8 @@ static void steeplechase_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28771,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28771, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -1882,18 +1484,8 @@ static void steeplechase_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28755,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28755, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -1912,18 +1504,8 @@ static void steeplechase_track_diag_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28770,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28770, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_STICK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -1947,18 +1529,8 @@ static void steeplechase_track_diag_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28754,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28754, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_STICK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -1981,11 +1553,7 @@ static void steeplechase_track_diag_25_deg_up(
 
 /** rct2: 0x008A5B18 */
 static void steeplechase_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1997,18 +1565,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28764,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28764, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2018,18 +1576,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28748,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28748, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2044,18 +1592,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28761,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28761, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2065,18 +1603,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28745,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28745, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2091,18 +1619,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28763,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28763, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2112,18 +1630,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28747,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28747, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2142,18 +1650,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28762,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28762, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -2177,18 +1675,8 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28746,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28746, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -2211,11 +1699,7 @@ static void steeplechase_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008A5B28 */
 static void steeplechase_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2227,18 +1711,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28768,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28768, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2248,18 +1722,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28752,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28752, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2274,18 +1738,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28765,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28765, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2295,18 +1749,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28749,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28749, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2321,18 +1765,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28767,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28767, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2342,18 +1776,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28751,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28751, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2372,18 +1796,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28766,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28766, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_STICK_ALT, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -2407,18 +1821,8 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28750,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28750, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_STICK_ALT, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -2441,11 +1845,7 @@ static void steeplechase_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008A5B68 */
 static void steeplechase_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2457,18 +1857,8 @@ static void steeplechase_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28770,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28770, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2478,18 +1868,8 @@ static void steeplechase_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28754,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28754, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2504,18 +1884,8 @@ static void steeplechase_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28771,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28771, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2525,18 +1895,8 @@ static void steeplechase_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28755,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28755, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2551,18 +1911,8 @@ static void steeplechase_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28769,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28769, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2572,18 +1922,8 @@ static void steeplechase_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28753,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28753, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2602,18 +1942,8 @@ static void steeplechase_track_diag_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28772,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28772, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_STICK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -2637,18 +1967,8 @@ static void steeplechase_track_diag_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28756,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28756, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_STICK_ALT, 0, 6, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -2671,11 +1991,7 @@ static void steeplechase_track_diag_25_deg_down(
 
 /** rct2: 0x008A5B48 */
 static void steeplechase_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2687,18 +2003,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28766,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28766, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2708,18 +2014,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28750,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28750, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2733,18 +2029,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28767,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28767, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2754,18 +2040,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28751,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28751, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2779,18 +2055,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28765,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28765, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2800,18 +2066,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28749,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28749, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2829,18 +2085,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28768,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28768, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_STICK_ALT, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -2864,18 +2110,8 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28752,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28752, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_STICK_ALT, 0, 4, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -2899,11 +2135,7 @@ static void steeplechase_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008A5B58 */
 static void steeplechase_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2915,18 +2147,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28762,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28762, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2936,18 +2158,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28746,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28746, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2962,18 +2174,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28763,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28763, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -2983,18 +2185,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28747,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28747, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3009,18 +2201,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28761,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28761, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3030,18 +2212,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28745,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28745, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -3060,18 +2232,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28764,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28764, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -3095,18 +2257,8 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
                         break;
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 28748,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 28748, -16, -16, 32, 32, 3, height, -16,
+                            -16, height);
                         metal_b_supports_paint_setup(
                             session, METAL_SUPPORTS_STICK_ALT, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS]);
                         break;
@@ -3129,11 +2281,7 @@ static void steeplechase_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x008A5AB8 */
 static void steeplechase_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
diff --git a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp
index ce206beaae..ff9b97c1cd 100644
--- a/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp
+++ b/src/openrct2/ride/coaster/SuspendedSwingingCoaster.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x008A8958 */
 static void suspended_swinging_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -35,33 +31,13 @@ static void suspended_swinging_rc_track_flat(
             case 0:
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25963,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25963, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 29);
                 break;
             case 1:
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25964,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25964, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 29);
                 break;
         }
@@ -73,33 +49,13 @@ static void suspended_swinging_rc_track_flat(
             case 0:
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25961,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25961, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 29);
                 break;
             case 1:
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25962,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25962, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 29);
                 break;
         }
@@ -118,11 +74,7 @@ static void suspended_swinging_rc_track_flat(
 
 /** rct2: 0x008A8AA8, 0x008A8AB8, 0x008A8AC8 */
 static void suspended_swinging_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -135,30 +87,10 @@ static void suspended_swinging_rc_track_station(
     sub_98197C_rotated(
         session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height, 0, 2, height);
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-        0,
-        0,
-        32,
-        20,
-        3,
-        height + 29,
-        0,
-        6,
+        session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 3, height + 29, 0, 6,
         height + 29);
     sub_98199C_rotated(
-        session,
-        direction,
-        imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS],
-        0,
-        6,
-        32,
-        20,
-        3,
-        height + 29,
-        0,
-        6,
+        session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 29, 0, 6,
         height + 29);
     track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 0);
     track_paint_util_draw_station_inverted(session, rideIndex, direction, height, tileElement, STATION_VARIANT_TALL);
@@ -169,11 +101,7 @@ static void suspended_swinging_rc_track_station(
 
 /** rct2: 0x008A8968 */
 static void suspended_swinging_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -182,62 +110,22 @@ static void suspended_swinging_rc_track_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26001,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26001, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26002,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26002, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26003,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26003, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26004,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26004, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
         }
@@ -248,62 +136,22 @@ static void suspended_swinging_rc_track_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25973,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25973, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25974,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25974, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25975,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25975, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25976,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25976, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 45);
                 break;
         }
@@ -347,73 +195,29 @@ static void suspended_swinging_rc_track_25_deg_up(
 
 /** rct2: 0x008A8978 */
 static void suspended_swinging_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25989,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25989, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 93);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25990,
-                0,
-                0,
-                32,
-                2,
-                81,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25990, 0, 0, 32, 2, 81, height + 29, 0, 4,
                 height + 11);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25991,
-                0,
-                0,
-                32,
-                2,
-                81,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25991, 0, 0, 32, 2, 81, height + 29, 0, 4,
                 height + 11);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25992,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25992, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 93);
             break;
     }
@@ -432,11 +236,7 @@ static void suspended_swinging_rc_track_60_deg_up(
 
 /** rct2: 0x008A8988 */
 static void suspended_swinging_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -445,62 +245,22 @@ static void suspended_swinging_rc_track_flat_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25993,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25993, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25994,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25994, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25995,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25995, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25996,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25996, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
         }
@@ -511,62 +271,22 @@ static void suspended_swinging_rc_track_flat_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25965,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25965, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25966,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25966, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25967,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25967, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25968,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25968, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
         }
@@ -610,99 +330,35 @@ static void suspended_swinging_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x008A8998 */
 static void suspended_swinging_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25977,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25977, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 61);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25981,
-                0,
-                0,
-                32,
-                10,
-                49,
-                height + 29,
-                0,
-                10,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25981, 0, 0, 32, 10, 49, height + 29, 0, 10,
                 height + 11);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25978,
-                0,
-                0,
-                32,
-                2,
-                49,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25978, 0, 0, 32, 2, 49, height + 29, 0, 4,
                 height + 11);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25982,
-                0,
-                0,
-                32,
-                10,
-                49,
-                height + 29,
-                0,
-                10,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25982, 0, 0, 32, 10, 49, height + 29, 0, 10,
                 height + 11);
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25979,
-                0,
-                0,
-                32,
-                2,
-                49,
-                height + 29,
-                0,
-                4,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25979, 0, 0, 32, 2, 49, height + 29, 0, 4,
                 height + 11);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25980,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25980, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 61);
             break;
     }
@@ -721,11 +377,7 @@ static void suspended_swinging_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008A89A8 */
 static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -734,88 +386,28 @@ static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25983,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25983, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 61);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25987,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 29,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25987, 0, 0, 32, 10, 49, height + 29, 0, 10,
                     height + 11);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26090,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26090, 0, 0, 32, 2, 49, height + 29, 0, 4,
                     height + 11);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25988,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 29,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25988, 0, 0, 32, 10, 49, height + 29, 0, 10,
                     height + 11);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25985,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25985, 0, 0, 32, 2, 49, height + 29, 0, 4,
                     height + 11);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25986,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25986, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 61);
                 break;
         }
@@ -826,88 +418,28 @@ static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25983,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25983, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 61);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25987,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 29,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25987, 0, 0, 32, 10, 49, height + 29, 0, 10,
                     height + 11);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25984,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25984, 0, 0, 32, 2, 49, height + 29, 0, 4,
                     height + 11);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25988,
-                    0,
-                    0,
-                    32,
-                    10,
-                    49,
-                    height + 29,
-                    0,
-                    10,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25988, 0, 0, 32, 10, 49, height + 29, 0, 10,
                     height + 11);
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25985,
-                    0,
-                    0,
-                    32,
-                    2,
-                    49,
-                    height + 29,
-                    0,
-                    4,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25985, 0, 0, 32, 2, 49, height + 29, 0, 4,
                     height + 11);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25986,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25986, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 61);
                 break;
         }
@@ -951,11 +483,7 @@ static void suspended_swinging_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A89B8 */
 static void suspended_swinging_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (track_element_is_lift_hill(tileElement))
@@ -964,62 +492,22 @@ static void suspended_swinging_rc_track_25_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25997,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25997, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25998,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25998, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25999,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25999, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 26000,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 26000, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
         }
@@ -1030,62 +518,22 @@ static void suspended_swinging_rc_track_25_deg_up_to_flat(
         {
             case 0:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25969,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25969, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 1:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25970,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25970, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 2:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25971,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25971, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
             case 3:
                 sub_98197C_rotated(
-                    session,
-                    direction,
-                    session->TrackColours[SCHEME_TRACK] | 25972,
-                    0,
-                    0,
-                    32,
-                    20,
-                    3,
-                    height + 29,
-                    0,
-                    6,
+                    session, direction, session->TrackColours[SCHEME_TRACK] | 25972, 0, 0, 32, 20, 3, height + 29, 0, 6,
                     height + 37);
                 break;
         }
@@ -1129,11 +577,7 @@ static void suspended_swinging_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x008A89C8 */
 static void suspended_swinging_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     suspended_swinging_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1141,11 +585,7 @@ static void suspended_swinging_rc_track_25_deg_down(
 
 /** rct2: 0x008A89D8 */
 static void suspended_swinging_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     suspended_swinging_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1153,11 +593,7 @@ static void suspended_swinging_rc_track_60_deg_down(
 
 /** rct2: 0x008A89E8 */
 static void suspended_swinging_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     suspended_swinging_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1165,11 +601,7 @@ static void suspended_swinging_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008A89F8 */
 static void suspended_swinging_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     suspended_swinging_rc_track_60_deg_up_to_25_deg_up(
@@ -1178,11 +610,7 @@ static void suspended_swinging_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008A8A08 */
 static void suspended_swinging_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     suspended_swinging_rc_track_25_deg_up_to_60_deg_up(
@@ -1191,11 +619,7 @@ static void suspended_swinging_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A8A18 */
 static void suspended_swinging_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     suspended_swinging_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1203,11 +627,7 @@ static void suspended_swinging_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x008A8A28 */
 static void suspended_swinging_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1217,71 +637,29 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26014,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26014, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26019,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26019, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26024,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26024, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26009,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26009, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1307,32 +685,12 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26023,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26023, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26008,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26008, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
@@ -1340,8 +698,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -1349,47 +706,17 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26012,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26012, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26017,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26017, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26022,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26022, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 3:
@@ -1409,17 +736,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26011,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26011, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
@@ -1432,17 +749,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26006,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26006, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 29);
                     break;
             }
@@ -1450,8 +757,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -1459,71 +765,29 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26010,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26010, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26015,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26015, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26020,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26020, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26005,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26005, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1543,11 +807,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x008A8A38 */
 static void suspended_swinging_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1557,11 +817,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x008A8A48 */
 static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1588,10 +844,8 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1628,8 +882,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 3:
@@ -1676,17 +929,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26115,
-                        16,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26115, 16, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 37);
                     break;
             }
@@ -1694,8 +937,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 6:
@@ -1720,10 +962,8 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1743,11 +983,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A8A58 */
 static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1774,10 +1010,8 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1814,8 +1048,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 3:
@@ -1850,17 +1083,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26080,
-                        16,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26080, 16, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 37);
                     break;
                 case 1:
@@ -1880,8 +1103,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 88, 0x20);
             break;
         case 6:
@@ -1906,10 +1128,8 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1929,11 +1149,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008A8A68 */
 static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1943,11 +1159,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A8A78 */
 static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1957,11 +1169,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008A8A88 */
 static void suspended_swinging_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2023,8 +1231,7 @@ static void suspended_swinging_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -2064,8 +1271,7 @@ static void suspended_swinging_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 2:
@@ -2122,11 +1328,7 @@ static void suspended_swinging_rc_track_s_bend_left(
 
 /** rct2: 0x008A8A98 */
 static void suspended_swinging_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2188,8 +1390,7 @@ static void suspended_swinging_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -2229,8 +1430,7 @@ static void suspended_swinging_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 2:
@@ -2287,11 +1487,7 @@ static void suspended_swinging_rc_track_s_bend_right(
 
 /** rct2: 0x008A8AD8 */
 static void suspended_swinging_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2301,71 +1497,29 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26070,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26070, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26073,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26073, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26076,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26076, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26067,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26067, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2383,17 +1537,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26069,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26069, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
@@ -2402,32 +1546,12 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26075,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26075, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26066,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26066, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
             }
@@ -2440,71 +1564,29 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26068,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26068, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26071,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26071, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26074,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26074, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26065,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26065, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 29);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 44, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2524,11 +1606,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x008A8AE8 */
 static void suspended_swinging_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -2538,11 +1616,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x008A8AF8 */
 static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2569,10 +1643,8 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2610,10 +1682,8 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2633,11 +1703,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A8B08 */
 static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2664,10 +1730,8 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2705,10 +1769,8 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 54, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2728,11 +1790,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008A8B18 */
 static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -2742,11 +1800,7 @@ static void suspended_swinging_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A8B28 */
 static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -2756,11 +1810,7 @@ static void suspended_swinging_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008A8B38 */
 static void suspended_swinging_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -2768,33 +1818,13 @@ static void suspended_swinging_rc_track_brakes(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26117,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26117, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26118,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26118, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
@@ -2812,11 +1842,7 @@ static void suspended_swinging_rc_track_brakes(
 
 /** rct2: 0x008A8B48 */
 static void suspended_swinging_rc_track_left_quarter_helix_large_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2826,71 +1852,29 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26054,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26054, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26059,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26059, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26064,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26064, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26049,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26049, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 46, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -2908,62 +1892,22 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26053,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26053, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26058,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26058, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26063,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26063, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26048,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26048, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
             }
@@ -2971,8 +1915,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -2980,62 +1923,22 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26052,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26052, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26057,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26057, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26062,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26062, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26047,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26047, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
             }
@@ -3051,62 +1954,22 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26051,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26051, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26056,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26056, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26061,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26061, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26046,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26046, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
             }
@@ -3114,8 +1977,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -3123,71 +1985,29 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26050,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26050, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26055,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26055, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26060,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26060, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26045,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26045, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 58, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3207,11 +2027,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_up(
 
 /** rct2: 0x008A8B58 */
 static void suspended_swinging_rc_track_right_quarter_helix_large_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3221,71 +2037,29 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26025,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26025, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26030,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26030, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26035,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26035, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26040,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26040, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 35);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 46, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3303,62 +2077,22 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26026,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26026, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26031,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26031, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26036,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26036, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26041,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26041, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
             }
@@ -3366,8 +2100,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -3375,62 +2108,22 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26027,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26027, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26032,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26032, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26037,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26037, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26042,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26042, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
             }
@@ -3446,62 +2139,22 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26028,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26028, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26033,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26033, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26038,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26038, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26043,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26043, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
             }
@@ -3509,8 +2162,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -3518,71 +2170,29 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26029,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26029, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26034,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26034, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26039,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26039, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26044,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26044, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 43);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 58, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3602,11 +2212,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_up(
 
 /** rct2: 0x008A8B68 */
 static void suspended_swinging_rc_track_left_quarter_helix_large_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3616,71 +2222,29 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26034,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26034, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26039,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26039, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26044,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26044, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26029,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26029, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 58, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3698,62 +2262,22 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26033,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26033, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26038,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26038, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26043,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26043, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26028,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26028, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
             }
@@ -3761,8 +2285,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -3770,62 +2293,22 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26032,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26032, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26037,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26037, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26042,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26042, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26027,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26027, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
             }
@@ -3841,62 +2324,22 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26031,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26031, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26036,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26036, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26041,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26041, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26026,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26026, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
             }
@@ -3904,8 +2347,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -3913,71 +2355,29 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26030,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26030, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26035,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26035, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26040,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26040, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26025,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26025, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 46, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -3997,11 +2397,7 @@ static void suspended_swinging_rc_track_left_quarter_helix_large_down(
 
 /** rct2: 0x008A8B78 */
 static void suspended_swinging_rc_track_right_quarter_helix_large_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4011,71 +2407,29 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26045,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26045, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26050,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26050, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26055,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26055, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26060,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26060, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 43);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 58, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -4093,62 +2447,22 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26046,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26046, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26051,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26051, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26056,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26056, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26061,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26061, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
             }
@@ -4156,8 +2470,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -4165,62 +2478,22 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26047,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26047, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26052,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26052, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26057,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26057, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26062,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26062, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 43);
                     break;
             }
@@ -4236,62 +2509,22 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26048,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26048, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26053,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26053, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26058,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26058, 0, 0, 16, 32, 3, height + 29, 0, 0,
                         height + 43);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26063,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26063, 0, 0, 16, 32, 3, height + 29, 16, 0,
                         height + 43);
                     break;
             }
@@ -4299,8 +2532,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -4308,71 +2540,29 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26049,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26049, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26054,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26054, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26059,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26059, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26064,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 29,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26064, 0, 0, 20, 32, 3, height + 29, 6, 0,
                         height + 35);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_TUBES, 4, 0, height + 46, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -4392,11 +2582,7 @@ static void suspended_swinging_rc_track_right_quarter_helix_large_down(
 
 /** rct2: 0x008A8B88 */
 static void suspended_swinging_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4406,62 +2592,22 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26167,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26167, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26171,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26171, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26175,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26175, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26179,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26179, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -4482,62 +2628,22 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26168,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26168, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26172,
-                        0,
-                        0,
-                        34,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26172, 0, 0, 34, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26176,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26176, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26180,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26180, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
@@ -4545,8 +2651,7 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -4554,70 +2659,28 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26169,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26169, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26173,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26173, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26177,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26177, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26181,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26181, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -4630,62 +2693,22 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26170,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26170, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26174,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26174, 0, 0, 16, 18, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26178,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26178, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26182,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26182, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
             }
@@ -4694,8 +2717,7 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -4723,11 +2745,7 @@ static void suspended_swinging_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x008A8B98 */
 static void suspended_swinging_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4737,62 +2755,22 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26151,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26151, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26155,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26155, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26159,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26159, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26163,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 29,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26163, 0, 0, 32, 20, 3, height + 29, 0, 6,
                         height + 29);
                     break;
             }
@@ -4813,62 +2791,22 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26152,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26152, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26156,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26156, 0, 0, 32, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26160,
-                        0,
-                        0,
-                        34,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26160, 0, 0, 34, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26164,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26164, 0, 0, 32, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
             }
@@ -4876,8 +2814,7 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -4885,70 +2822,28 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26153,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26153, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26157,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26157, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26161,
-                        0,
-                        0,
-                        28,
-                        28,
-                        3,
-                        height + 29,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26161, 0, 0, 28, 28, 3, height + 29, 4, 4,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26165,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26165, 0, 0, 16, 16, 3, height + 29, 0, 16,
                         height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -4961,62 +2856,22 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26154,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26154, 0, 0, 16, 16, 3, height + 29, 16, 0,
                         height + 29);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26158,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26158, 0, 0, 16, 16, 3, height + 29, 0, 0,
                         height + 29);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26162,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height + 29,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26162, 0, 0, 16, 18, 3, height + 29, 0, 16,
                         height + 29);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26166,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26166, 0, 0, 16, 16, 3, height + 29, 16, 16,
                         height + 29);
                     break;
             }
@@ -5025,8 +2880,7 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -5054,11 +2908,7 @@ static void suspended_swinging_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x008A8BA8 */
 static void suspended_swinging_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -5068,11 +2918,7 @@ static void suspended_swinging_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008A8BB8 */
 static void suspended_swinging_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -5082,11 +2928,7 @@ static void suspended_swinging_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008A8BC8 */
 static void suspended_swinging_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5098,18 +2940,8 @@ static void suspended_swinging_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26214,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26214, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -5119,18 +2951,8 @@ static void suspended_swinging_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26186,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26186, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -5145,18 +2967,8 @@ static void suspended_swinging_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26211,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26211, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -5166,18 +2978,8 @@ static void suspended_swinging_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26183,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26183, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -5192,18 +2994,8 @@ static void suspended_swinging_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26213,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26213, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -5213,18 +3005,8 @@ static void suspended_swinging_rc_track_diag_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26185,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26185, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -5239,18 +3021,8 @@ static void suspended_swinging_rc_track_diag_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26212,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26212, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -5260,18 +3032,8 @@ static void suspended_swinging_rc_track_diag_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26184,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 29);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26184, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 29);
                         break;
                 }
             }
@@ -5305,11 +3067,7 @@ static void suspended_swinging_rc_track_diag_flat(
 
 /** rct2: 0x008A8BF8 */
 static void suspended_swinging_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5321,18 +3079,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26226,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26226, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -5342,18 +3090,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26198,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26198, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -5368,18 +3106,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26223,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26223, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -5389,18 +3117,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26195,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26195, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -5415,18 +3133,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26225,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26225, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -5436,18 +3144,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26197,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26197, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -5462,18 +3160,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26224,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26224, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -5483,18 +3171,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26196,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26196, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -5528,11 +3206,7 @@ static void suspended_swinging_rc_track_diag_25_deg_up(
 
 /** rct2: 0x008A8C58 */
 static void suspended_swinging_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5542,18 +3216,8 @@ static void suspended_swinging_rc_track_diag_60_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26210,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26210, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -5565,18 +3229,8 @@ static void suspended_swinging_rc_track_diag_60_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26207,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26207, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -5588,18 +3242,8 @@ static void suspended_swinging_rc_track_diag_60_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26209,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26209, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -5611,18 +3255,8 @@ static void suspended_swinging_rc_track_diag_60_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26208,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26208, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
 
@@ -5655,11 +3289,7 @@ static void suspended_swinging_rc_track_diag_60_deg_up(
 
 /** rct2: 0x008A8BD8 */
 static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5671,18 +3301,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26218,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26218, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -5692,18 +3312,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26190,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26190, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -5718,18 +3328,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26215,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26215, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -5739,18 +3339,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26187,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26187, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -5765,18 +3355,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26217,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26217, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -5786,18 +3366,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26189,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26189, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -5812,18 +3382,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26216,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26216, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -5833,18 +3393,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26188,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26188, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -5878,11 +3428,7 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008A8C38 */
 static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5892,18 +3438,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26202,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26202, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -5915,18 +3451,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26199,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26199, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -5938,18 +3464,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26201,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26201, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -5961,18 +3477,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26200,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26200, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
 
@@ -6005,11 +3511,7 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008A8C48 */
 static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6019,18 +3521,8 @@ static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26206,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26206, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -6042,18 +3534,8 @@ static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26203,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26203, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -6065,18 +3547,8 @@ static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26205,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26205, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -6088,17 +3560,7 @@ static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26204,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26204, -16, -16, 16, 16, 3, height + 29, 0, 0,
                         height + 61);
                     break;
             }
@@ -6132,11 +3594,7 @@ static void suspended_swinging_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008A8BE8 */
 static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6148,18 +3606,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26222,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26222, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6169,18 +3617,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26194,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26194, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6195,18 +3633,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26219,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26219, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6216,18 +3644,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26191,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26191, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6242,18 +3660,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26221,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26221, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6263,18 +3671,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26193,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26193, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6289,18 +3687,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26220,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26220, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6310,18 +3698,8 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26192,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26192, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6355,11 +3733,7 @@ static void suspended_swinging_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008A8C28 */
 static void suspended_swinging_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6371,18 +3745,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26224,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26224, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -6392,18 +3756,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26196,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26196, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -6418,18 +3772,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26225,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26225, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -6439,18 +3783,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26197,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26197, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -6465,18 +3799,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26223,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26223, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -6486,18 +3810,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26195,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26195, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -6512,18 +3826,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26226,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26226, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -6533,18 +3837,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26198,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 45);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26198, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 45);
                         break;
                 }
             }
@@ -6578,11 +3872,7 @@ static void suspended_swinging_rc_track_diag_25_deg_down(
 
 /** rct2: 0x008A8C88 */
 static void suspended_swinging_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6592,18 +3882,8 @@ static void suspended_swinging_rc_track_diag_60_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26208,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 29);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26208, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 29);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -6615,18 +3895,8 @@ static void suspended_swinging_rc_track_diag_60_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26209,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26209, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -6638,18 +3908,8 @@ static void suspended_swinging_rc_track_diag_60_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26207,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26207, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -6661,18 +3921,8 @@ static void suspended_swinging_rc_track_diag_60_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26210,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 93);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26210, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 93);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -6684,11 +3934,7 @@ static void suspended_swinging_rc_track_diag_60_deg_down(
 
 /** rct2: 0x008A8C08 */
 static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6700,18 +3946,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26220,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26220, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6721,18 +3957,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26192,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26192, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6746,18 +3972,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26221,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26221, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6767,18 +3983,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26193,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26193, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6792,18 +3998,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26219,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26219, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6813,18 +4009,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26191,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26191, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6838,18 +4024,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26222,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26222, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6859,18 +4035,8 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26194,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26194, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -6904,11 +4070,7 @@ static void suspended_swinging_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008A8C68 */
 static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6918,17 +4080,7 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26204,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        3,
-                        height + 29,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26204, -16, -16, 16, 16, 3, height + 29, 0, 0,
                         height + 61);
                     break;
             }
@@ -6941,18 +4093,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26205,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26205, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -6964,18 +4106,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26203,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26203, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -6987,18 +4119,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26206,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26206, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
 
@@ -7031,11 +4153,7 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008A8C78 */
 static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7045,18 +4163,8 @@ static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26200,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26200, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -7068,18 +4176,8 @@ static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26201,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26201, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -7091,18 +4189,8 @@ static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26199,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26199, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -7114,18 +4202,8 @@ static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 26202,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 29,
-                        -16,
-                        -16,
-                        height + 61);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 26202, -16, -16, 32, 32, 3, height + 29, -16,
+                        -16, height + 61);
                     break;
             }
 
@@ -7158,11 +4236,7 @@ static void suspended_swinging_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A8C18 */
 static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7174,18 +4248,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26216,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26216, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -7195,18 +4259,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26188,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26188, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -7221,18 +4275,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26217,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26217, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -7242,18 +4286,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26189,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26189, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -7268,18 +4302,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26215,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26215, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -7289,18 +4313,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26187,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26187, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -7315,18 +4329,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26218,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26218, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -7336,18 +4340,8 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            session->TrackColours[SCHEME_TRACK] | 26190,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            3,
-                            height + 29,
-                            -16,
-                            -16,
-                            height + 37);
+                            session, direction, session->TrackColours[SCHEME_TRACK] | 26190, -16, -16, 32, 32, 3, height + 29,
+                            -16, -16, height + 37);
                         break;
                 }
             }
@@ -7381,11 +4375,7 @@ static void suspended_swinging_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x008A8B38 */
 static void suspended_swinging_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -7393,33 +4383,13 @@ static void suspended_swinging_rc_track_block_brakes(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26117,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26117, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 26118,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 29,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 26118, 0, 0, 32, 20, 3, height + 29, 0, 6,
                 height + 29);
             break;
     }
diff --git a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp
index 354ed9dd2b..5a4c66bb8e 100644
--- a/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/TwisterRollerCoaster.cpp
@@ -22,11 +22,7 @@
 
 /** rct2: 0x008AB6A4 */
 static void twister_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES);
@@ -34,11 +30,7 @@ static void twister_rc_track_flat(
 
 /** rct2: 0x008AB8F4, 0x008AB904, 0x008AB914 */
 static void twister_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_station(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES);
@@ -46,11 +38,7 @@ static void twister_rc_track_station(
 
 /** rct2: 0x008AB6B4 */
 static void twister_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES);
@@ -58,11 +46,7 @@ static void twister_rc_track_25_deg_up(
 
 /** rct2: 0x008AB6C4 */
 static void twister_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_up(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES);
@@ -70,11 +54,7 @@ static void twister_rc_track_60_deg_up(
 
 /** rct2: 0x008AB6D4 */
 static void twister_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_25_deg_up(
@@ -83,11 +63,7 @@ static void twister_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x008AB6E4 */
 static void twister_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_to_60_deg_up(
@@ -96,11 +72,7 @@ static void twister_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008AB6F4 */
 static void twister_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_up_to_25_deg_up(
@@ -109,11 +81,7 @@ static void twister_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008AB704 */
 static void twister_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_to_flat(
@@ -122,11 +90,7 @@ static void twister_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x008AB714 */
 static void twister_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down(
@@ -135,11 +99,7 @@ static void twister_rc_track_25_deg_down(
 
 /** rct2: 0x008AB724 */
 static void twister_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_down(
@@ -148,11 +108,7 @@ static void twister_rc_track_60_deg_down(
 
 /** rct2: 0x008AB734 */
 static void twister_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_25_deg_down(
@@ -161,11 +117,7 @@ static void twister_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008AB744 */
 static void twister_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_to_60_deg_down(
@@ -174,11 +126,7 @@ static void twister_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008AB754 */
 static void twister_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_down_to_25_deg_down(
@@ -187,11 +135,7 @@ static void twister_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008AB764 */
 static void twister_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_to_flat(
@@ -200,11 +144,7 @@ static void twister_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x008AB774 */
 static void twister_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_5(
@@ -213,11 +153,7 @@ static void twister_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x008AB784 */
 static void twister_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_5(
@@ -226,11 +162,7 @@ static void twister_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x008AB794 */
 static void twister_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_left_bank(
@@ -239,11 +171,7 @@ static void twister_rc_track_flat_to_left_bank(
 
 /** rct2: 0x008AB7A4 */
 static void twister_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_right_bank(
@@ -252,11 +180,7 @@ static void twister_rc_track_flat_to_right_bank(
 
 /** rct2: 0x008AB7B4 */
 static void twister_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_bank_to_flat(
@@ -265,11 +189,7 @@ static void twister_rc_track_left_bank_to_flat(
 
 /** rct2: 0x008AB7C4 */
 static void twister_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_bank_to_flat(
@@ -278,11 +198,7 @@ static void twister_rc_track_right_bank_to_flat(
 
 /** rct2: 0x008AB7D4 */
 static void twister_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_banked_left_quarter_turn_5(
@@ -291,11 +207,7 @@ static void twister_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x008AB7E4 */
 static void twister_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_banked_right_quarter_turn_5(
@@ -304,11 +216,7 @@ static void twister_rc_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x008AB7F4 */
 static void twister_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_bank_to_25_deg_up(
@@ -317,11 +225,7 @@ static void twister_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x008AB804 */
 static void twister_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_bank_to_25_deg_up(
@@ -330,11 +234,7 @@ static void twister_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x008AB814 */
 static void twister_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_to_left_bank(
@@ -343,11 +243,7 @@ static void twister_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x008AB824 */
 static void twister_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_to_right_bank(
@@ -356,11 +252,7 @@ static void twister_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x008AB834 */
 static void twister_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_bank_to_25_deg_down(
@@ -369,11 +261,7 @@ static void twister_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x008AB844 */
 static void twister_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_bank_to_25_deg_down(
@@ -382,11 +270,7 @@ static void twister_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x008AB854 */
 static void twister_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_to_left_bank(
@@ -395,11 +279,7 @@ static void twister_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x008AB864 */
 static void twister_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_to_right_bank(
@@ -408,11 +288,7 @@ static void twister_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x008AB874 */
 static void twister_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_bank(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES);
@@ -420,11 +296,7 @@ static void twister_rc_track_left_bank(
 
 /** rct2: 0x008AB884 */
 static void twister_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_bank(
@@ -433,11 +305,7 @@ static void twister_rc_track_right_bank(
 
 /** rct2: 0x008AB894 */
 static void twister_rc_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(
@@ -446,11 +314,7 @@ static void twister_rc_track_left_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008AB8A4 */
 static void twister_rc_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(
@@ -459,11 +323,7 @@ static void twister_rc_track_right_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008AB8B4 */
 static void twister_rc_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(
@@ -472,11 +332,7 @@ static void twister_rc_track_left_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008AB8C4 */
 static void twister_rc_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(
@@ -485,11 +341,7 @@ static void twister_rc_track_right_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008AB8D4 */
 static void twister_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_s_bend_left(
@@ -498,11 +350,7 @@ static void twister_rc_track_s_bend_left(
 
 /** rct2: 0x008AB8E4 */
 static void twister_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_s_bend_right(
@@ -511,11 +359,7 @@ static void twister_rc_track_s_bend_right(
 
 /** rct2: 0x008ABA84 */
 static void twister_rc_track_left_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_vertical_loop(
@@ -524,11 +368,7 @@ static void twister_rc_track_left_vertical_loop(
 
 /** rct2: 0x008ABA94 */
 static void twister_rc_track_right_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_vertical_loop(
@@ -537,11 +377,7 @@ static void twister_rc_track_right_vertical_loop(
 
 /** rct2: 0x008AB924 */
 static void twister_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_3(
@@ -550,11 +386,7 @@ static void twister_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x008AB934 */
 static void twister_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_3(
@@ -563,11 +395,7 @@ static void twister_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x008AB944 */
 static void twister_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_3_bank(
@@ -576,11 +404,7 @@ static void twister_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x008AB954 */
 static void twister_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_3_bank(
@@ -589,11 +413,7 @@ static void twister_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x008AB964 */
 static void twister_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(
@@ -602,11 +422,7 @@ static void twister_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008AB974 */
 static void twister_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(
@@ -615,11 +431,7 @@ static void twister_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008AB984 */
 static void twister_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(
@@ -628,11 +440,7 @@ static void twister_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008AB994 */
 static void twister_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(
@@ -641,11 +449,7 @@ static void twister_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008AB9A4 */
 static void twister_rc_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_half_banked_helix_up_small(
@@ -654,11 +458,7 @@ static void twister_rc_track_left_half_banked_helix_up_small(
 
 /** rct2: 0x008AB9B4 */
 static void twister_rc_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_half_banked_helix_up_small(
@@ -667,11 +467,7 @@ static void twister_rc_track_right_half_banked_helix_up_small(
 
 /** rct2: 0x008AB9C4 */
 static void twister_rc_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_half_banked_helix_down_small(
@@ -680,11 +476,7 @@ static void twister_rc_track_left_half_banked_helix_down_small(
 
 /** rct2: 0x008AB9D4 */
 static void twister_rc_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_half_banked_helix_down_small(
@@ -693,11 +485,7 @@ static void twister_rc_track_right_half_banked_helix_down_small(
 
 /** rct2: 0x008AB9E4 */
 static void twister_rc_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_half_banked_helix_up_large(
@@ -706,11 +494,7 @@ static void twister_rc_track_left_half_banked_helix_up_large(
 
 /** rct2: 0x008AB9F4 */
 static void twister_rc_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_half_banked_helix_up_large(
@@ -719,11 +503,7 @@ static void twister_rc_track_right_half_banked_helix_up_large(
 
 /** rct2: 0x008ABA04 */
 static void twister_rc_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_half_banked_helix_down_large(
@@ -732,11 +512,7 @@ static void twister_rc_track_left_half_banked_helix_down_large(
 
 /** rct2: 0x008ABA14 */
 static void twister_rc_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_half_banked_helix_down_large(
@@ -745,11 +521,7 @@ static void twister_rc_track_right_half_banked_helix_down_large(
 
 /** rct2: 0x008ABA44 */
 static void twister_rc_track_left_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(
@@ -758,11 +530,7 @@ static void twister_rc_track_left_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008ABA24 */
 static void twister_rc_track_right_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(
@@ -771,11 +539,7 @@ static void twister_rc_track_right_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008ABA34 */
 static void twister_rc_track_left_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(
@@ -784,11 +548,7 @@ static void twister_rc_track_left_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008ABA54 */
 static void twister_rc_track_right_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(
@@ -797,11 +557,7 @@ static void twister_rc_track_right_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008ABA64 */
 static void twister_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_brakes(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES);
@@ -809,11 +565,7 @@ static void twister_rc_track_brakes(
 
 /** rct2: 0x008ABE04 */
 static void twister_rc_track_25_deg_up_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_left_banked(
@@ -822,11 +574,7 @@ static void twister_rc_track_25_deg_up_left_banked(
 
 /** rct2: 0x008ABE14 */
 static void twister_rc_track_25_deg_up_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_right_banked(
@@ -835,11 +583,7 @@ static void twister_rc_track_25_deg_up_right_banked(
 
 /** rct2: 0x008ABA74 */
 static void twister_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_on_ride_photo(
@@ -848,11 +592,7 @@ static void twister_rc_track_on_ride_photo(
 
 /** rct2: 0x008ABE24 */
 static void twister_rc_track_25_deg_down_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_left_banked(
@@ -861,11 +601,7 @@ static void twister_rc_track_25_deg_down_left_banked(
 
 /** rct2: 0x008ABE34 */
 static void twister_rc_track_25_deg_down_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_right_banked(
@@ -874,11 +610,7 @@ static void twister_rc_track_25_deg_down_right_banked(
 
 /** rct2: 0x008ABE44 */
 static void twister_rc_track_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_90_deg_up(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES);
@@ -886,11 +618,7 @@ static void twister_rc_track_90_deg_up(
 
 /** rct2: 0x008ABE54 */
 static void twister_rc_track_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_90_deg_down(
@@ -899,11 +627,7 @@ static void twister_rc_track_90_deg_down(
 
 /** rct2: 0x008ABE64 */
 static void twister_rc_track_60_deg_up_to_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_up_to_90_deg_up(
@@ -912,11 +636,7 @@ static void twister_rc_track_60_deg_up_to_90_deg_up(
 
 /** rct2: 0x008ABE74 */
 static void twister_rc_track_90_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_90_deg_down_to_60_deg_down(
@@ -925,11 +645,7 @@ static void twister_rc_track_90_deg_down_to_60_deg_down(
 
 /** rct2: 0x008ABE84 */
 static void twister_rc_track_90_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_90_deg_up_to_60_deg_up(
@@ -938,11 +654,7 @@ static void twister_rc_track_90_deg_up_to_60_deg_up(
 
 /** rct2: 0x008ABE94 */
 static void twister_rc_track_60_deg_down_to_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_down_to_90_deg_down(
@@ -951,11 +663,7 @@ static void twister_rc_track_60_deg_down_to_90_deg_down(
 
 /** rct2: 0x008ABAB4 */
 static void twister_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_eighth_to_diag(
@@ -964,11 +672,7 @@ static void twister_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x008ABAC4 */
 static void twister_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_eighth_to_diag(
@@ -977,11 +681,7 @@ static void twister_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x008ABAD4 */
 static void twister_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_eighth_to_orthogonal(
@@ -990,11 +690,7 @@ static void twister_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008ABAE4 */
 static void twister_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_eighth_to_orthogonal(
@@ -1003,11 +699,7 @@ static void twister_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008ABAF4 */
 static void twister_rc_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_eighth_bank_to_diag(
@@ -1016,11 +708,7 @@ static void twister_rc_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x008ABB04 */
 static void twister_rc_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_eighth_bank_to_diag(
@@ -1029,11 +717,7 @@ static void twister_rc_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x008ABB14 */
 static void twister_rc_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_eighth_bank_to_orthogonal(
@@ -1042,11 +726,7 @@ static void twister_rc_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008ABB24 */
 static void twister_rc_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_eighth_bank_to_orthogonal(
@@ -1055,11 +735,7 @@ static void twister_rc_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008ABAA4 */
 static void twister_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_flat(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES);
@@ -1067,11 +743,7 @@ static void twister_rc_track_diag_flat(
 
 /** rct2: 0x008ABB54 */
 static void twister_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_up(
@@ -1080,11 +752,7 @@ static void twister_rc_track_diag_25_deg_up(
 
 /** rct2: 0x008ABBB4 */
 static void twister_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_60_deg_up(
@@ -1093,11 +761,7 @@ static void twister_rc_track_diag_60_deg_up(
 
 /** rct2: 0x008ABB34 */
 static void twister_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_flat_to_25_deg_up(
@@ -1106,11 +770,7 @@ static void twister_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008ABB94 */
 static void twister_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(
@@ -1119,11 +779,7 @@ static void twister_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008ABBA4 */
 static void twister_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(
@@ -1132,11 +788,7 @@ static void twister_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008ABB44 */
 static void twister_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_up_to_flat(
@@ -1145,11 +797,7 @@ static void twister_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008ABB84 */
 static void twister_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_down(
@@ -1158,11 +806,7 @@ static void twister_rc_track_diag_25_deg_down(
 
 /** rct2: 0x008ABBE4 */
 static void twister_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_60_deg_down(
@@ -1171,11 +815,7 @@ static void twister_rc_track_diag_60_deg_down(
 
 /** rct2: 0x008ABB64 */
 static void twister_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_flat_to_25_deg_down(
@@ -1184,11 +824,7 @@ static void twister_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008ABBC4 */
 static void twister_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(
@@ -1197,11 +833,7 @@ static void twister_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008ABBD4 */
 static void twister_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(
@@ -1210,11 +842,7 @@ static void twister_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008ABB74 */
 static void twister_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_down_to_flat(
@@ -1223,11 +851,7 @@ static void twister_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x008ABC14 */
 static void twister_rc_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_flat_to_left_bank(
@@ -1236,11 +860,7 @@ static void twister_rc_track_diag_flat_to_left_bank(
 
 /** rct2: 0x008ABC24 */
 static void twister_rc_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_flat_to_right_bank(
@@ -1249,11 +869,7 @@ static void twister_rc_track_diag_flat_to_right_bank(
 
 /** rct2: 0x008ABC34 */
 static void twister_rc_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_left_bank_to_flat(
@@ -1262,11 +878,7 @@ static void twister_rc_track_diag_left_bank_to_flat(
 
 /** rct2: 0x008ABC44 */
 static void twister_rc_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_right_bank_to_flat(
@@ -1275,11 +887,7 @@ static void twister_rc_track_diag_right_bank_to_flat(
 
 /** rct2: 0x008ABC74 */
 static void twister_rc_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_left_bank_to_25_deg_up(
@@ -1288,11 +896,7 @@ static void twister_rc_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x008ABC84 */
 static void twister_rc_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_right_bank_to_25_deg_up(
@@ -1301,11 +905,7 @@ static void twister_rc_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x008ABC54 */
 static void twister_rc_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_up_to_left_bank(
@@ -1314,11 +914,7 @@ static void twister_rc_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x008ABC64 */
 static void twister_rc_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_up_to_right_bank(
@@ -1327,11 +923,7 @@ static void twister_rc_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x008ABC94 */
 static void twister_rc_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_left_bank_to_25_deg_down(
@@ -1340,11 +932,7 @@ static void twister_rc_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x008ABCA4 */
 static void twister_rc_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_right_bank_to_25_deg_down(
@@ -1353,11 +941,7 @@ static void twister_rc_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x008ABCB4 */
 static void twister_rc_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_down_to_left_bank(
@@ -1366,11 +950,7 @@ static void twister_rc_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x008ABCC4 */
 static void twister_rc_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_down_to_right_bank(
@@ -1379,11 +959,7 @@ static void twister_rc_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x008ABBF4 */
 static void twister_rc_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_left_bank(
@@ -1392,11 +968,7 @@ static void twister_rc_track_diag_left_bank(
 
 /** rct2: 0x008ABC04 */
 static void twister_rc_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_right_bank(
@@ -1405,11 +977,7 @@ static void twister_rc_track_diag_right_bank(
 
 /** rct2: 0x008ABD74 */
 static void twister_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(
@@ -1418,11 +986,7 @@ static void twister_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008ABD84 */
 static void twister_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(
@@ -1431,11 +995,7 @@ static void twister_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008ABD94 */
 static void twister_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(
@@ -1444,11 +1004,7 @@ static void twister_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(
 
 /** rct2: 0x008ABDA4 */
 static void twister_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(
@@ -1457,11 +1013,7 @@ static void twister_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(
 
 /** rct2: 0x008AC0E4 */
 static void twister_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_block_brakes(
@@ -1470,11 +1022,7 @@ static void twister_rc_track_block_brakes(
 
 /** rct2: 0x008ABEA4 */
 static void twister_rc_track_left_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(
@@ -1483,11 +1031,7 @@ static void twister_rc_track_left_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008ABEB4 */
 static void twister_rc_track_right_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(
@@ -1496,11 +1040,7 @@ static void twister_rc_track_right_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008ABEC4 */
 static void twister_rc_track_left_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(
@@ -1509,11 +1049,7 @@ static void twister_rc_track_left_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008ABED4 */
 static void twister_rc_track_right_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(
@@ -1522,11 +1058,7 @@ static void twister_rc_track_right_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008ABEE4 */
 static void twister_rc_track_left_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(
@@ -1535,11 +1067,7 @@ static void twister_rc_track_left_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008ABEF4 */
 static void twister_rc_track_right_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(
@@ -1548,11 +1076,7 @@ static void twister_rc_track_right_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008ABF04 */
 static void twister_rc_track_left_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(
@@ -1561,11 +1085,7 @@ static void twister_rc_track_left_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008ABF14 */
 static void twister_rc_track_right_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(
@@ -1574,11 +1094,7 @@ static void twister_rc_track_right_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008ABF24 */
 static void twister_rc_track_25_deg_up_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(
@@ -1587,11 +1103,7 @@ static void twister_rc_track_25_deg_up_to_left_banked_25_deg_up(
 
 /** rct2: 0x008ABF34 */
 static void twister_rc_track_25_deg_up_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(
@@ -1600,11 +1112,7 @@ static void twister_rc_track_25_deg_up_to_right_banked_25_deg_up(
 
 /** rct2: 0x008ABF44 */
 static void twister_rc_track_left_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(
@@ -1613,11 +1121,7 @@ static void twister_rc_track_left_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x008ABF54 */
 static void twister_rc_track_right_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(
@@ -1626,11 +1130,7 @@ static void twister_rc_track_right_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x008ABF64 */
 static void twister_rc_track_25_deg_down_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(
@@ -1639,11 +1139,7 @@ static void twister_rc_track_25_deg_down_to_left_banked_25_deg_down(
 
 /** rct2: 0x008ABF74 */
 static void twister_rc_track_25_deg_down_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(
@@ -1652,11 +1148,7 @@ static void twister_rc_track_25_deg_down_to_right_banked_25_deg_down(
 
 /** rct2: 0x008ABF84 */
 static void twister_rc_track_left_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(
@@ -1665,11 +1157,7 @@ static void twister_rc_track_left_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x008ABF94 */
 static void twister_rc_track_right_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(
@@ -1678,11 +1166,7 @@ static void twister_rc_track_right_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x008ABFA4 */
 static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(
@@ -1691,11 +1175,7 @@ static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x008ABFB4 */
 static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(
@@ -1704,11 +1184,7 @@ static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x008ABFE4 */
 static void twister_rc_track_left_banked_25_deg_up_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(
@@ -1717,11 +1193,7 @@ static void twister_rc_track_left_banked_25_deg_up_to_left_banked_flat(
 
 /** rct2: 0x008ABFF4 */
 static void twister_rc_track_right_banked_25_deg_up_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(
@@ -1730,11 +1202,7 @@ static void twister_rc_track_right_banked_25_deg_up_to_right_banked_flat(
 
 /** rct2: 0x008AC004 */
 static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(
@@ -1743,11 +1211,7 @@ static void twister_rc_track_left_banked_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x008AC014 */
 static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(
@@ -1756,11 +1220,7 @@ static void twister_rc_track_right_banked_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x008ABFC4 */
 static void twister_rc_track_left_banked_25_deg_down_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(
@@ -1769,11 +1229,7 @@ static void twister_rc_track_left_banked_25_deg_down_to_left_banked_flat(
 
 /** rct2: 0x008ABFD4 */
 static void twister_rc_track_right_banked_25_deg_down_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(
@@ -1782,11 +1238,7 @@ static void twister_rc_track_right_banked_25_deg_down_to_right_banked_flat(
 
 /** rct2: 0x008AC024 */
 static void twister_rc_track_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_left_banked_25_deg_up(
@@ -1795,11 +1247,7 @@ static void twister_rc_track_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x008AC034 */
 static void twister_rc_track_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_right_banked_25_deg_up(
@@ -1808,11 +1256,7 @@ static void twister_rc_track_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x008AC044 */
 static void twister_rc_track_left_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_25_deg_up_to_flat(
@@ -1821,11 +1265,7 @@ static void twister_rc_track_left_banked_25_deg_up_to_flat(
 
 /** rct2: 0x008AC054 */
 static void twister_rc_track_right_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_25_deg_up_to_flat(
@@ -1834,11 +1274,7 @@ static void twister_rc_track_right_banked_25_deg_up_to_flat(
 
 /** rct2: 0x008AC064 */
 static void twister_rc_track_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_left_banked_25_deg_down(
@@ -1847,11 +1283,7 @@ static void twister_rc_track_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x008AC074 */
 static void twister_rc_track_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_right_banked_25_deg_down(
@@ -1860,11 +1292,7 @@ static void twister_rc_track_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x008AC084 */
 static void twister_rc_track_left_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_25_deg_down_to_flat(
@@ -1873,11 +1301,7 @@ static void twister_rc_track_left_banked_25_deg_down_to_flat(
 
 /** rct2: 0x008AC094 */
 static void twister_rc_track_right_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_25_deg_down_to_flat(
@@ -1886,11 +1310,7 @@ static void twister_rc_track_right_banked_25_deg_down_to_flat(
 
 /** rct2: 0x008AC0A4 */
 static void twister_rc_track_left_quarter_turn_1_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(
@@ -1899,11 +1319,7 @@ static void twister_rc_track_left_quarter_turn_1_90_deg_up(
 
 /** rct2: 0x008AC0B4 */
 static void twister_rc_track_right_quarter_turn_1_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(
@@ -1912,11 +1328,7 @@ static void twister_rc_track_right_quarter_turn_1_90_deg_up(
 
 /** rct2: 0x008AC0C4 */
 static void twister_rc_track_left_quarter_turn_1_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(
@@ -1925,11 +1337,7 @@ static void twister_rc_track_left_quarter_turn_1_90_deg_down(
 
 /** rct2: 0x008AC0D4 */
 static void twister_rc_track_right_quarter_turn_1_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(
@@ -1938,11 +1346,7 @@ static void twister_rc_track_right_quarter_turn_1_90_deg_down(
 
 /* The following track elements used to be specific to the Vertical Roller Coaster */
 static void twister_rc_track_flat_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_60_deg_up(
@@ -1950,11 +1354,7 @@ static void twister_rc_track_flat_to_60_deg_up(
 }
 
 static void twister_rc_track_60_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_up_to_flat(
@@ -1962,11 +1362,7 @@ static void twister_rc_track_60_deg_up_to_flat(
 }
 
 static void twister_rc_track_flat_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_60_deg_up(
@@ -1974,11 +1370,7 @@ static void twister_rc_track_flat_to_60_deg_down(
 }
 
 static void twister_rc_track_60_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_up_to_flat(
@@ -1986,11 +1378,7 @@ static void twister_rc_track_60_deg_down_to_flat(
 }
 
 static void twister_rc_track_brake_for_drop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_brake_for_drop(
@@ -1998,11 +1386,7 @@ static void twister_rc_track_brake_for_drop(
 }
 
 static void twister_rc_track_diag_flat_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_flat_to_60_deg_up(
@@ -2010,11 +1394,7 @@ static void twister_rc_track_diag_flat_to_60_deg_up(
 }
 
 static void twister_rc_track_diag_60_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_60_deg_up_to_flat(
@@ -2022,11 +1402,7 @@ static void twister_rc_track_diag_60_deg_up_to_flat(
 }
 
 static void twister_rc_track_diag_flat_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_flat_to_60_deg_down(
@@ -2034,11 +1410,7 @@ static void twister_rc_track_diag_flat_to_60_deg_down(
 }
 
 static void twister_rc_track_diag_60_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_60_deg_down_to_flat(
@@ -2048,11 +1420,7 @@ static void twister_rc_track_diag_60_deg_down_to_flat(
 /* The following track elements used to be specific to the Steel Twister */
 /** rct2: 0x008ABCD4 */
 static void twister_rc_track_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_half_loop_up(
@@ -2061,11 +1429,7 @@ static void twister_rc_track_half_loop_up(
 
 /** rct2: 0x008ABCE4 */
 static void twister_rc_track_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_half_loop_down(
@@ -2074,11 +1438,7 @@ static void twister_rc_track_half_loop_down(
 
 /** rct2: 0x008ABD34 */
 static void twister_rc_track_left_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_corkscrew_up(
@@ -2087,11 +1447,7 @@ static void twister_rc_track_left_corkscrew_up(
 
 /** rct2: 0x008ABD44 */
 static void twister_rc_track_right_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_corkscrew_up(
@@ -2100,11 +1456,7 @@ static void twister_rc_track_right_corkscrew_up(
 
 /** rct2: 0x008ABD54 */
 static void twister_rc_track_left_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_corkscrew_down(
@@ -2113,11 +1465,7 @@ static void twister_rc_track_left_corkscrew_down(
 
 /** rct2: 0x008ABD64 */
 static void twister_rc_track_right_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_corkscrew_down(
@@ -2126,11 +1474,7 @@ static void twister_rc_track_right_corkscrew_down(
 
 /** rct2: 0x008AC0F4 */
 static void twister_rc_track_flat_to_60_deg_up_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_60_deg_up_long_base(
@@ -2139,11 +1483,7 @@ static void twister_rc_track_flat_to_60_deg_up_long_base(
 
 /** rct2: 0x008AC104 */
 static void twister_rc_track_60_deg_up_to_flat_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_up_to_flat_long_base(
@@ -2152,11 +1492,7 @@ static void twister_rc_track_60_deg_up_to_flat_long_base(
 
 /** rct2: 0x008AC114 */
 static void twister_rc_track_flat_to_60_deg_down_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_60_deg_down_long_base(
@@ -2165,11 +1501,7 @@ static void twister_rc_track_flat_to_60_deg_down_long_base(
 
 /** rct2: 0x008AC124 */
 static void twister_rc_track_60_deg_up_to_flat_long_base122(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_up_to_flat_long_base122(
@@ -2178,11 +1510,7 @@ static void twister_rc_track_60_deg_up_to_flat_long_base122(
 
 /** rct2: 0x008ABCF4 */
 static void twister_rc_track_left_barrel_roll_up_to_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_barrel_roll_up_to_down(
@@ -2191,11 +1519,7 @@ static void twister_rc_track_left_barrel_roll_up_to_down(
 
 /** rct2: 0x008ABD04 */
 static void twister_rc_track_right_barrel_roll_up_to_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_barrel_roll_up_to_down(
@@ -2204,11 +1528,7 @@ static void twister_rc_track_right_barrel_roll_up_to_down(
 
 /** rct2: 0x008ABD14 */
 static void twister_rc_track_left_barrel_roll_down_to_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_barrel_roll_down_to_up(
@@ -2217,11 +1537,7 @@ static void twister_rc_track_left_barrel_roll_down_to_up(
 
 /** rct2: 0x008ABD24 */
 static void twister_rc_track_right_barrel_roll_down_to_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_barrel_roll_down_to_up(
@@ -2230,11 +1546,7 @@ static void twister_rc_track_right_barrel_roll_down_to_up(
 
 /** rct2: 0x008ABDB4 */
 static void twister_rc_track_powered_lift(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_powered_lift(
@@ -2243,11 +1555,7 @@ static void twister_rc_track_powered_lift(
 
 /** rct2: 0x008ABDC4 */
 static void twister_rc_track_left_large_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_large_half_loop_up(
@@ -2256,11 +1564,7 @@ static void twister_rc_track_left_large_half_loop_up(
 
 /** rct2: 0x008ABDD4 */
 static void twister_rc_track_right_large_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_large_half_loop_up(
@@ -2269,11 +1573,7 @@ static void twister_rc_track_right_large_half_loop_up(
 
 /** rct2: 0x008ABDE4 */
 static void twister_rc_track_right_large_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_large_half_loop_down(
@@ -2282,11 +1582,7 @@ static void twister_rc_track_right_large_half_loop_down(
 
 /** rct2: 0x008ABDF4 */
 static void twister_rc_track_left_large_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_large_half_loop_down(
@@ -2295,11 +1591,7 @@ static void twister_rc_track_left_large_half_loop_down(
 
 /** rct2: 0x008AC134 */
 static void twister_rc_track_90_deg_to_inverted_flat_quarter_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(
@@ -2308,11 +1600,7 @@ static void twister_rc_track_90_deg_to_inverted_flat_quarter_loop_up(
 
 /** rct2: 0x008AC144 */
 static void twister_rc_track_inverted_flat_to_90_deg_quarter_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(
@@ -2320,11 +1608,7 @@ static void twister_rc_track_inverted_flat_to_90_deg_quarter_loop_down(
 }
 
 static void twister_rc_track_booster(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_booster(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_TUBES);
diff --git a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp
index 097a96c163..c44c3e8cf2 100644
--- a/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/VerticalDropRollerCoaster.cpp
@@ -14,22 +14,14 @@
 
 /** rct2: 0x008AA00C */
 static void vertical_drop_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED);
 }
 
 static void vertical_drop_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_station(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED);
@@ -37,11 +29,7 @@ static void vertical_drop_rc_track_station(
 
 /** rct2: 0x008AA01C */
 static void vertical_drop_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED);
@@ -49,11 +37,7 @@ static void vertical_drop_rc_track_25_deg_up(
 
 /** rct2: 0x008AA02C */
 static void vertical_drop_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_up(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED);
@@ -61,11 +45,7 @@ static void vertical_drop_rc_track_60_deg_up(
 
 /** rct2: 0x008AA03C */
 static void vertical_drop_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_25_deg_up(
@@ -74,11 +54,7 @@ static void vertical_drop_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x008AA04C */
 static void vertical_drop_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_to_60_deg_up(
@@ -87,11 +63,7 @@ static void vertical_drop_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008AA05C */
 static void vertical_drop_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_up_to_25_deg_up(
@@ -100,11 +72,7 @@ static void vertical_drop_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008AA06C */
 static void vertical_drop_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_to_flat(
@@ -113,11 +81,7 @@ static void vertical_drop_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x008AA07C */
 static void vertical_drop_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down(
@@ -126,11 +90,7 @@ static void vertical_drop_rc_track_25_deg_down(
 
 /** rct2: 0x008AA08C */
 static void vertical_drop_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_down(
@@ -139,11 +99,7 @@ static void vertical_drop_rc_track_60_deg_down(
 
 /** rct2: 0x008AA09C */
 static void vertical_drop_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_25_deg_down(
@@ -152,11 +108,7 @@ static void vertical_drop_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008AA0AC */
 static void vertical_drop_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_to_60_deg_down(
@@ -165,11 +117,7 @@ static void vertical_drop_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008AA0BC */
 static void vertical_drop_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_down_to_25_deg_down(
@@ -178,11 +126,7 @@ static void vertical_drop_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008AA0CC */
 static void vertical_drop_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_to_flat(
@@ -191,11 +135,7 @@ static void vertical_drop_rc_track_25_deg_down_to_flat(
 
 /** rct2: 0x008AA0DC */
 static void vertical_drop_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_5(
@@ -204,11 +144,7 @@ static void vertical_drop_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x008AA0EC */
 static void vertical_drop_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_5(
@@ -217,11 +153,7 @@ static void vertical_drop_rc_track_right_quarter_turn_5(
 
 /** rct2: 0x008AA0FC */
 static void vertical_drop_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_left_bank(
@@ -230,11 +162,7 @@ static void vertical_drop_rc_track_flat_to_left_bank(
 
 /** rct2: 0x008AA10C */
 static void vertical_drop_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_right_bank(
@@ -243,11 +171,7 @@ static void vertical_drop_rc_track_flat_to_right_bank(
 
 /** rct2: 0x008AA11C */
 static void vertical_drop_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_bank_to_flat(
@@ -256,11 +180,7 @@ static void vertical_drop_rc_track_left_bank_to_flat(
 
 /** rct2: 0x008AA12C */
 static void vertical_drop_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_bank_to_flat(
@@ -269,11 +189,7 @@ static void vertical_drop_rc_track_right_bank_to_flat(
 
 /** rct2: 0x008AA13C */
 static void vertical_drop_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_banked_left_quarter_turn_5(
@@ -282,11 +198,7 @@ static void vertical_drop_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x008AA14C */
 static void vertical_drop_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_banked_right_quarter_turn_5(
@@ -295,11 +207,7 @@ static void vertical_drop_rc_track_banked_right_quarter_turn_5(
 
 /** rct2: 0x008AA15C */
 static void vertical_drop_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_bank_to_25_deg_up(
@@ -308,11 +216,7 @@ static void vertical_drop_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x008AA16C */
 static void vertical_drop_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_bank_to_25_deg_up(
@@ -321,11 +225,7 @@ static void vertical_drop_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x008AA17C */
 static void vertical_drop_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_to_left_bank(
@@ -334,11 +234,7 @@ static void vertical_drop_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x008AA18C */
 static void vertical_drop_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_to_right_bank(
@@ -347,11 +243,7 @@ static void vertical_drop_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x008AA19C */
 static void vertical_drop_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_bank_to_25_deg_down(
@@ -360,11 +252,7 @@ static void vertical_drop_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x008AA1AC */
 static void vertical_drop_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_bank_to_25_deg_down(
@@ -373,11 +261,7 @@ static void vertical_drop_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x008AA1BC */
 static void vertical_drop_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_to_left_bank(
@@ -386,11 +270,7 @@ static void vertical_drop_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x008AA1CC */
 static void vertical_drop_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_to_right_bank(
@@ -399,11 +279,7 @@ static void vertical_drop_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x008AA1DC */
 static void vertical_drop_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_bank(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED);
@@ -411,11 +287,7 @@ static void vertical_drop_rc_track_left_bank(
 
 /** rct2: 0x008AA1EC */
 static void vertical_drop_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_bank(
@@ -424,11 +296,7 @@ static void vertical_drop_rc_track_right_bank(
 
 /** rct2: 0x008AA1FC */
 static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_5_25_deg_up(
@@ -437,11 +305,7 @@ static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008AA20C */
 static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_5_25_deg_up(
@@ -450,11 +314,7 @@ static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008AA21C */
 static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_5_25_deg_down(
@@ -463,11 +323,7 @@ static void vertical_drop_rc_track_left_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008AA22C */
 static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_5_25_deg_down(
@@ -476,11 +332,7 @@ static void vertical_drop_rc_track_right_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008AA23C */
 static void vertical_drop_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_s_bend_left(
@@ -489,11 +341,7 @@ static void vertical_drop_rc_track_s_bend_left(
 
 /** rct2: 0x008AA24C */
 static void vertical_drop_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_s_bend_right(
@@ -502,11 +350,7 @@ static void vertical_drop_rc_track_s_bend_right(
 
 /** rct2: 0x008AA49C */
 static void vertical_drop_rc_track_left_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_vertical_loop(
@@ -515,11 +359,7 @@ static void vertical_drop_rc_track_left_vertical_loop(
 
 /** rct2: 0x008AA4AC */
 static void vertical_drop_rc_track_right_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_vertical_loop(
@@ -528,11 +368,7 @@ static void vertical_drop_rc_track_right_vertical_loop(
 
 /** rct2: 0x008AA28C */
 static void vertical_drop_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_3(
@@ -541,11 +377,7 @@ static void vertical_drop_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x008AA29C */
 static void vertical_drop_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_3(
@@ -554,11 +386,7 @@ static void vertical_drop_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x008AA2AC */
 static void vertical_drop_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_3_bank(
@@ -567,11 +395,7 @@ static void vertical_drop_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x008AA2BC */
 static void vertical_drop_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_3_bank(
@@ -580,11 +404,7 @@ static void vertical_drop_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x008AA2CC */
 static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_3_25_deg_up(
@@ -593,11 +413,7 @@ static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008AA2DC */
 static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_3_25_deg_up(
@@ -606,11 +422,7 @@ static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008AA2EC */
 static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_3_25_deg_down(
@@ -619,11 +431,7 @@ static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008AA2FC */
 static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_3_25_deg_down(
@@ -632,11 +440,7 @@ static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008AA30C */
 static void vertical_drop_rc_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_half_banked_helix_up_small(
@@ -645,11 +449,7 @@ static void vertical_drop_rc_track_left_half_banked_helix_up_small(
 
 /** rct2: 0x008AA31C */
 static void vertical_drop_rc_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_half_banked_helix_up_small(
@@ -658,11 +458,7 @@ static void vertical_drop_rc_track_right_half_banked_helix_up_small(
 
 /** rct2: 0x008AA32C */
 static void vertical_drop_rc_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_half_banked_helix_down_small(
@@ -671,11 +467,7 @@ static void vertical_drop_rc_track_left_half_banked_helix_down_small(
 
 /** rct2: 0x008AA33C */
 static void vertical_drop_rc_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_half_banked_helix_down_small(
@@ -684,11 +476,7 @@ static void vertical_drop_rc_track_right_half_banked_helix_down_small(
 
 /** rct2: 0x008AA34C */
 static void vertical_drop_rc_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_half_banked_helix_up_large(
@@ -697,11 +485,7 @@ static void vertical_drop_rc_track_left_half_banked_helix_up_large(
 
 /** rct2: 0x008AA35C */
 static void vertical_drop_rc_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_half_banked_helix_up_large(
@@ -710,11 +494,7 @@ static void vertical_drop_rc_track_right_half_banked_helix_up_large(
 
 /** rct2: 0x008AA36C */
 static void vertical_drop_rc_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_half_banked_helix_down_large(
@@ -723,11 +503,7 @@ static void vertical_drop_rc_track_left_half_banked_helix_down_large(
 
 /** rct2: 0x008AA37C */
 static void vertical_drop_rc_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_half_banked_helix_down_large(
@@ -736,11 +512,7 @@ static void vertical_drop_rc_track_right_half_banked_helix_down_large(
 
 /** rct2: 0x008AA3AC */
 static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_1_60_deg_up(
@@ -749,11 +521,7 @@ static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008AA38C */
 static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_1_60_deg_up(
@@ -762,11 +530,7 @@ static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008AA39C */
 static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_1_60_deg_down(
@@ -775,11 +539,7 @@ static void vertical_drop_rc_track_left_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008AA3BC */
 static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_1_60_deg_down(
@@ -788,11 +548,7 @@ static void vertical_drop_rc_track_right_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008AA40C */
 static void vertical_drop_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_brakes(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED);
@@ -800,11 +556,7 @@ static void vertical_drop_rc_track_brakes(
 
 /** rct2: 0x008AA7EC */
 static void vertical_drop_rc_track_25_deg_up_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_left_banked(
@@ -813,11 +565,7 @@ static void vertical_drop_rc_track_25_deg_up_left_banked(
 
 /** rct2: 0x008AA7FC */
 static void vertical_drop_rc_track_25_deg_up_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_right_banked(
@@ -826,11 +574,7 @@ static void vertical_drop_rc_track_25_deg_up_right_banked(
 
 /** rct2: 0x008AA41C */
 static void vertical_drop_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_on_ride_photo(
@@ -839,11 +583,7 @@ static void vertical_drop_rc_track_on_ride_photo(
 
 /** rct2: 0x008AA80C */
 static void vertical_drop_rc_track_25_deg_down_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_left_banked(
@@ -852,11 +592,7 @@ static void vertical_drop_rc_track_25_deg_down_left_banked(
 
 /** rct2: 0x008AA81C */
 static void vertical_drop_rc_track_25_deg_down_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_right_banked(
@@ -865,11 +601,7 @@ static void vertical_drop_rc_track_25_deg_down_right_banked(
 
 /** rct2: 0x008AA42C */
 static void vertical_drop_rc_track_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_90_deg_up(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED);
@@ -877,11 +609,7 @@ static void vertical_drop_rc_track_90_deg_up(
 
 /** rct2: 0x008AA43C */
 static void vertical_drop_rc_track_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_90_deg_down(
@@ -890,11 +618,7 @@ static void vertical_drop_rc_track_90_deg_down(
 
 /** rct2: 0x008AA44C */
 static void vertical_drop_rc_track_60_deg_up_to_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_up_to_90_deg_up(
@@ -903,11 +627,7 @@ static void vertical_drop_rc_track_60_deg_up_to_90_deg_up(
 
 /** rct2: 0x008AA45C */
 static void vertical_drop_rc_track_90_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_90_deg_down_to_60_deg_down(
@@ -916,11 +636,7 @@ static void vertical_drop_rc_track_90_deg_down_to_60_deg_down(
 
 /** rct2: 0x008AA46C */
 static void vertical_drop_rc_track_90_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_90_deg_up_to_60_deg_up(
@@ -929,11 +645,7 @@ static void vertical_drop_rc_track_90_deg_up_to_60_deg_up(
 
 /** rct2: 0x008AA47C */
 static void vertical_drop_rc_track_60_deg_down_to_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_down_to_90_deg_down(
@@ -942,11 +654,7 @@ static void vertical_drop_rc_track_60_deg_down_to_90_deg_down(
 
 /** rct2: 0x008AA4CC */
 static void vertical_drop_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_eighth_to_diag(
@@ -955,11 +663,7 @@ static void vertical_drop_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x008AA4DC */
 static void vertical_drop_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_eighth_to_diag(
@@ -968,11 +672,7 @@ static void vertical_drop_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x008AA4EC */
 static void vertical_drop_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_eighth_to_orthogonal(
@@ -981,11 +681,7 @@ static void vertical_drop_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008AA4FC */
 static void vertical_drop_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_eighth_to_orthogonal(
@@ -994,11 +690,7 @@ static void vertical_drop_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008AA50C */
 static void vertical_drop_rc_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_eighth_bank_to_diag(
@@ -1007,11 +699,7 @@ static void vertical_drop_rc_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x008AA51C */
 static void vertical_drop_rc_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_eighth_bank_to_diag(
@@ -1020,11 +708,7 @@ static void vertical_drop_rc_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x008AA52C */
 static void vertical_drop_rc_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_eighth_bank_to_orthogonal(
@@ -1033,11 +717,7 @@ static void vertical_drop_rc_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008AA53C */
 static void vertical_drop_rc_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_eighth_bank_to_orthogonal(
@@ -1046,11 +726,7 @@ static void vertical_drop_rc_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008AA4BC */
 static void vertical_drop_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_flat(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED);
@@ -1058,11 +734,7 @@ static void vertical_drop_rc_track_diag_flat(
 
 /** rct2: 0x008AA56C */
 static void vertical_drop_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_up(
@@ -1071,11 +743,7 @@ static void vertical_drop_rc_track_diag_25_deg_up(
 
 /** rct2: 0x008AA5CC */
 static void vertical_drop_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_60_deg_up(
@@ -1084,11 +752,7 @@ static void vertical_drop_rc_track_diag_60_deg_up(
 
 /** rct2: 0x008AA54C */
 static void vertical_drop_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_flat_to_25_deg_up(
@@ -1097,11 +761,7 @@ static void vertical_drop_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008AA5AC */
 static void vertical_drop_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_up_to_60_deg_up(
@@ -1110,11 +770,7 @@ static void vertical_drop_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008AA5BC */
 static void vertical_drop_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_60_deg_up_to_25_deg_up(
@@ -1123,11 +779,7 @@ static void vertical_drop_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008AA55C */
 static void vertical_drop_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_up_to_flat(
@@ -1136,11 +788,7 @@ static void vertical_drop_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008AA59C */
 static void vertical_drop_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_down(
@@ -1149,11 +797,7 @@ static void vertical_drop_rc_track_diag_25_deg_down(
 
 /** rct2: 0x008AA5FC */
 static void vertical_drop_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_60_deg_down(
@@ -1162,11 +806,7 @@ static void vertical_drop_rc_track_diag_60_deg_down(
 
 /** rct2: 0x008AA57C */
 static void vertical_drop_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_flat_to_25_deg_down(
@@ -1175,11 +815,7 @@ static void vertical_drop_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008AA5DC */
 static void vertical_drop_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_down_to_60_deg_down(
@@ -1188,11 +824,7 @@ static void vertical_drop_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008AA5EC */
 static void vertical_drop_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_60_deg_down_to_25_deg_down(
@@ -1201,11 +833,7 @@ static void vertical_drop_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008AA58C */
 static void vertical_drop_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_down_to_flat(
@@ -1214,11 +842,7 @@ static void vertical_drop_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x008AA62C */
 static void vertical_drop_rc_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_flat_to_left_bank(
@@ -1227,11 +851,7 @@ static void vertical_drop_rc_track_diag_flat_to_left_bank(
 
 /** rct2: 0x008AA63C */
 static void vertical_drop_rc_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_flat_to_right_bank(
@@ -1240,11 +860,7 @@ static void vertical_drop_rc_track_diag_flat_to_right_bank(
 
 /** rct2: 0x008AA64C */
 static void vertical_drop_rc_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_left_bank_to_flat(
@@ -1253,11 +869,7 @@ static void vertical_drop_rc_track_diag_left_bank_to_flat(
 
 /** rct2: 0x008AA65C */
 static void vertical_drop_rc_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_right_bank_to_flat(
@@ -1266,11 +878,7 @@ static void vertical_drop_rc_track_diag_right_bank_to_flat(
 
 /** rct2: 0x008AA68C */
 static void vertical_drop_rc_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_left_bank_to_25_deg_up(
@@ -1279,11 +887,7 @@ static void vertical_drop_rc_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x008AA69C */
 static void vertical_drop_rc_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_right_bank_to_25_deg_up(
@@ -1292,11 +896,7 @@ static void vertical_drop_rc_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x008AA66C */
 static void vertical_drop_rc_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_up_to_left_bank(
@@ -1305,11 +905,7 @@ static void vertical_drop_rc_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x008AA67C */
 static void vertical_drop_rc_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_up_to_right_bank(
@@ -1318,11 +914,7 @@ static void vertical_drop_rc_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x008AA6AC */
 static void vertical_drop_rc_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_left_bank_to_25_deg_down(
@@ -1331,11 +923,7 @@ static void vertical_drop_rc_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x008AA6BC */
 static void vertical_drop_rc_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_right_bank_to_25_deg_down(
@@ -1344,11 +932,7 @@ static void vertical_drop_rc_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x008AA6CC */
 static void vertical_drop_rc_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_down_to_left_bank(
@@ -1357,11 +941,7 @@ static void vertical_drop_rc_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x008AA6DC */
 static void vertical_drop_rc_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_25_deg_down_to_right_bank(
@@ -1370,11 +950,7 @@ static void vertical_drop_rc_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x008AA60C */
 static void vertical_drop_rc_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_left_bank(
@@ -1383,11 +959,7 @@ static void vertical_drop_rc_track_diag_left_bank(
 
 /** rct2: 0x008AA61C */
 static void vertical_drop_rc_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_right_bank(
@@ -1396,11 +968,7 @@ static void vertical_drop_rc_track_diag_right_bank(
 
 /** rct2: 0x008AA72C */
 static void vertical_drop_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_bank_to_left_quarter_turn_3_25_deg_up(
@@ -1409,11 +977,7 @@ static void vertical_drop_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008AA73C */
 static void vertical_drop_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_bank_to_right_quarter_turn_3_25_deg_up(
@@ -1422,11 +986,7 @@ static void vertical_drop_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008AA74C */
 static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_3_25_deg_down_to_left_bank(
@@ -1435,11 +995,7 @@ static void vertical_drop_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(
 
 /** rct2: 0x008AA75C */
 static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_3_25_deg_down_to_right_bank(
@@ -1448,11 +1004,7 @@ static void vertical_drop_rc_track_right_quarter_turn_3_25_deg_down_to_right_ban
 
 /** rct2: 0x008AA9EC */
 static void vertical_drop_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_block_brakes(
@@ -1461,11 +1013,7 @@ static void vertical_drop_rc_track_block_brakes(
 
 /** rct2: 0x008AA96C */
 static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_up(
@@ -1474,11 +1022,7 @@ static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008AA97C */
 static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_up(
@@ -1487,11 +1031,7 @@ static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008AA98C */
 static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_quarter_turn_3_25_deg_down(
@@ -1500,11 +1040,7 @@ static void vertical_drop_rc_track_left_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008AA99C */
 static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_quarter_turn_3_25_deg_down(
@@ -1513,11 +1049,7 @@ static void vertical_drop_rc_track_right_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008AA8AC */
 static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_up(
@@ -1526,11 +1058,7 @@ static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008AA8BC */
 static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_up(
@@ -1539,11 +1067,7 @@ static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008AA8CC */
 static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_quarter_turn_5_25_deg_down(
@@ -1552,11 +1076,7 @@ static void vertical_drop_rc_track_left_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008AA8DC */
 static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_quarter_turn_5_25_deg_down(
@@ -1565,11 +1085,7 @@ static void vertical_drop_rc_track_right_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008AA82C */
 static void vertical_drop_rc_track_25_deg_up_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_to_left_banked_25_deg_up(
@@ -1578,11 +1094,7 @@ static void vertical_drop_rc_track_25_deg_up_to_left_banked_25_deg_up(
 
 /** rct2: 0x008AA83C */
 static void vertical_drop_rc_track_25_deg_up_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_up_to_right_banked_25_deg_up(
@@ -1591,11 +1103,7 @@ static void vertical_drop_rc_track_25_deg_up_to_right_banked_25_deg_up(
 
 /** rct2: 0x008AA84C */
 static void vertical_drop_rc_track_left_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_25_deg_up_to_25_deg_up(
@@ -1604,11 +1112,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x008AA85C */
 static void vertical_drop_rc_track_right_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_25_deg_up_to_25_deg_up(
@@ -1617,11 +1121,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x008AA86C */
 static void vertical_drop_rc_track_25_deg_down_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_to_left_banked_25_deg_down(
@@ -1630,11 +1130,7 @@ static void vertical_drop_rc_track_25_deg_down_to_left_banked_25_deg_down(
 
 /** rct2: 0x008AA87C */
 static void vertical_drop_rc_track_25_deg_down_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_25_deg_down_to_right_banked_25_deg_down(
@@ -1643,11 +1139,7 @@ static void vertical_drop_rc_track_25_deg_down_to_right_banked_25_deg_down(
 
 /** rct2: 0x008AA88C */
 static void vertical_drop_rc_track_left_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_25_deg_down_to_25_deg_down(
@@ -1656,11 +1148,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x008AA89C */
 static void vertical_drop_rc_track_right_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_25_deg_down_to_25_deg_down(
@@ -1669,11 +1157,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x008AA8EC */
 static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_up(
@@ -1682,11 +1166,7 @@ static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x008AA8FC */
 static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_up(
@@ -1695,11 +1175,7 @@ static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x008AA92C */
 static void vertical_drop_rc_track_left_banked_25_deg_up_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_25_deg_up_to_left_banked_flat(
@@ -1708,11 +1184,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_up_to_left_banked_flat(
 
 /** rct2: 0x008AA93C */
 static void vertical_drop_rc_track_right_banked_25_deg_up_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_25_deg_up_to_right_banked_flat(
@@ -1721,11 +1193,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_up_to_right_banked_flat(
 
 /** rct2: 0x008AA94C */
 static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_flat_to_left_banked_25_deg_down(
@@ -1734,11 +1202,7 @@ static void vertical_drop_rc_track_left_banked_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x008AA95C */
 static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_flat_to_right_banked_25_deg_down(
@@ -1747,11 +1211,7 @@ static void vertical_drop_rc_track_right_banked_flat_to_right_banked_25_deg_down
 
 /** rct2: 0x008AA90C */
 static void vertical_drop_rc_track_left_banked_25_deg_down_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_25_deg_down_to_left_banked_flat(
@@ -1760,11 +1220,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_down_to_left_banked_flat(
 
 /** rct2: 0x008AA91C */
 static void vertical_drop_rc_track_right_banked_25_deg_down_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_25_deg_down_to_right_banked_flat(
@@ -1773,11 +1229,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_down_to_right_banked_flat
 
 /** rct2: 0x008AA76C */
 static void vertical_drop_rc_track_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_left_banked_25_deg_up(
@@ -1786,11 +1238,7 @@ static void vertical_drop_rc_track_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x008AA77C */
 static void vertical_drop_rc_track_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_right_banked_25_deg_up(
@@ -1799,11 +1247,7 @@ static void vertical_drop_rc_track_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x008AA78C */
 static void vertical_drop_rc_track_left_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_25_deg_up_to_flat(
@@ -1812,11 +1256,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_up_to_flat(
 
 /** rct2: 0x008AA79C */
 static void vertical_drop_rc_track_right_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_25_deg_up_to_flat(
@@ -1825,11 +1265,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_up_to_flat(
 
 /** rct2: 0x008AA7AC */
 static void vertical_drop_rc_track_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_left_banked_25_deg_down(
@@ -1838,11 +1274,7 @@ static void vertical_drop_rc_track_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x008AA7BC */
 static void vertical_drop_rc_track_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_right_banked_25_deg_down(
@@ -1851,11 +1283,7 @@ static void vertical_drop_rc_track_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x008AA7CC */
 static void vertical_drop_rc_track_left_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_banked_25_deg_down_to_flat(
@@ -1864,11 +1292,7 @@ static void vertical_drop_rc_track_left_banked_25_deg_down_to_flat(
 
 /** rct2: 0x008AA7DC */
 static void vertical_drop_rc_track_right_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_banked_25_deg_down_to_flat(
@@ -1877,11 +1301,7 @@ static void vertical_drop_rc_track_right_banked_25_deg_down_to_flat(
 
 /** rct2: 0x008AA9AC */
 static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_1_90_deg_up(
@@ -1890,11 +1310,7 @@ static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_up(
 
 /** rct2: 0x008AA9BC */
 static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_1_90_deg_up(
@@ -1903,11 +1319,7 @@ static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_up(
 
 /** rct2: 0x008AA9CC */
 static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_quarter_turn_1_90_deg_down(
@@ -1916,11 +1328,7 @@ static void vertical_drop_rc_track_left_quarter_turn_1_90_deg_down(
 
 /** rct2: 0x008AA9DC */
 static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_quarter_turn_1_90_deg_down(
@@ -1930,11 +1338,7 @@ static void vertical_drop_rc_track_right_quarter_turn_1_90_deg_down(
 /* The following elements used to be specific to the vertical_drop RC */
 /** rct2: 0x008AA3CC */
 static void vertical_drop_rc_track_flat_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_60_deg_up(
@@ -1943,11 +1347,7 @@ static void vertical_drop_rc_track_flat_to_60_deg_up(
 
 /** rct2: 0x008AA3DC */
 static void vertical_drop_rc_track_60_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_up_to_flat(
@@ -1956,11 +1356,7 @@ static void vertical_drop_rc_track_60_deg_up_to_flat(
 
 /** rct2: 0x008AA3EC */
 static void vertical_drop_rc_track_flat_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_60_deg_down(
@@ -1969,11 +1365,7 @@ static void vertical_drop_rc_track_flat_to_60_deg_down(
 
 /** rct2: 0x008AA3FC */
 static void vertical_drop_rc_track_60_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_down_to_flat(
@@ -1982,11 +1374,7 @@ static void vertical_drop_rc_track_60_deg_down_to_flat(
 
 /** rct2: 0x008AA48C */
 static void vertical_drop_rc_track_brake_for_drop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_brake_for_drop(
@@ -1995,11 +1383,7 @@ static void vertical_drop_rc_track_brake_for_drop(
 
 /** rct2: 0x008AA6EC */
 static void vertical_drop_rc_track_diag_flat_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_flat_to_60_deg_up(
@@ -2008,11 +1392,7 @@ static void vertical_drop_rc_track_diag_flat_to_60_deg_up(
 
 /** rct2: 0x008AA6FC */
 static void vertical_drop_rc_track_diag_60_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_60_deg_up_to_flat(
@@ -2021,11 +1401,7 @@ static void vertical_drop_rc_track_diag_60_deg_up_to_flat(
 
 /** rct2: 0x008AA70C */
 static void vertical_drop_rc_track_diag_flat_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_flat_to_60_deg_down(
@@ -2034,11 +1410,7 @@ static void vertical_drop_rc_track_diag_flat_to_60_deg_down(
 
 /** rct2: 0x008AA71C */
 static void vertical_drop_rc_track_diag_60_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_diag_60_deg_down_to_flat(
@@ -2047,11 +1419,7 @@ static void vertical_drop_rc_track_diag_60_deg_down_to_flat(
 
 /* The following elements used to be specific to the steel twister RC */
 static void vertical_drop_rc_track_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_half_loop_up(
@@ -2059,11 +1427,7 @@ static void vertical_drop_rc_track_half_loop_up(
 }
 
 static void vertical_drop_rc_track_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_half_loop_down(
@@ -2071,11 +1435,7 @@ static void vertical_drop_rc_track_half_loop_down(
 }
 
 static void vertical_drop_rc_track_left_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_corkscrew_up(
@@ -2083,11 +1443,7 @@ static void vertical_drop_rc_track_left_corkscrew_up(
 }
 
 static void vertical_drop_rc_track_right_corkscrew_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_corkscrew_up(
@@ -2095,11 +1451,7 @@ static void vertical_drop_rc_track_right_corkscrew_up(
 }
 
 static void vertical_drop_rc_track_left_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_corkscrew_down(
@@ -2107,11 +1459,7 @@ static void vertical_drop_rc_track_left_corkscrew_down(
 }
 
 static void vertical_drop_rc_track_right_corkscrew_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_corkscrew_down(
@@ -2119,11 +1467,7 @@ static void vertical_drop_rc_track_right_corkscrew_down(
 }
 
 static void vertical_drop_rc_track_flat_to_60_deg_up_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_60_deg_up_long_base(
@@ -2131,11 +1475,7 @@ static void vertical_drop_rc_track_flat_to_60_deg_up_long_base(
 }
 
 static void vertical_drop_rc_track_60_deg_up_to_flat_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_up_to_flat_long_base(
@@ -2143,11 +1483,7 @@ static void vertical_drop_rc_track_60_deg_up_to_flat_long_base(
 }
 
 static void vertical_drop_rc_track_flat_to_60_deg_down_long_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_flat_to_60_deg_down_long_base(
@@ -2155,11 +1491,7 @@ static void vertical_drop_rc_track_flat_to_60_deg_down_long_base(
 }
 
 static void vertical_drop_rc_track_60_deg_up_to_flat_long_base122(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_60_deg_up_to_flat_long_base122(
@@ -2167,11 +1499,7 @@ static void vertical_drop_rc_track_60_deg_up_to_flat_long_base122(
 }
 
 static void vertical_drop_rc_track_left_barrel_roll_up_to_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_barrel_roll_up_to_down(
@@ -2179,11 +1507,7 @@ static void vertical_drop_rc_track_left_barrel_roll_up_to_down(
 }
 
 static void vertical_drop_rc_track_right_barrel_roll_up_to_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_barrel_roll_up_to_down(
@@ -2191,11 +1515,7 @@ static void vertical_drop_rc_track_right_barrel_roll_up_to_down(
 }
 
 static void vertical_drop_rc_track_left_barrel_roll_down_to_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_barrel_roll_down_to_up(
@@ -2203,11 +1523,7 @@ static void vertical_drop_rc_track_left_barrel_roll_down_to_up(
 }
 
 static void vertical_drop_rc_track_right_barrel_roll_down_to_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_barrel_roll_down_to_up(
@@ -2215,11 +1531,7 @@ static void vertical_drop_rc_track_right_barrel_roll_down_to_up(
 }
 
 static void vertical_drop_rc_track_powered_lift(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_powered_lift(
@@ -2227,11 +1539,7 @@ static void vertical_drop_rc_track_powered_lift(
 }
 
 static void vertical_drop_rc_track_left_large_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_large_half_loop_up(
@@ -2239,11 +1547,7 @@ static void vertical_drop_rc_track_left_large_half_loop_up(
 }
 
 static void vertical_drop_rc_track_right_large_half_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_large_half_loop_up(
@@ -2251,11 +1555,7 @@ static void vertical_drop_rc_track_right_large_half_loop_up(
 }
 
 static void vertical_drop_rc_track_right_large_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_right_large_half_loop_down(
@@ -2263,11 +1563,7 @@ static void vertical_drop_rc_track_right_large_half_loop_down(
 }
 
 static void vertical_drop_rc_track_left_large_half_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_left_large_half_loop_down(
@@ -2275,11 +1571,7 @@ static void vertical_drop_rc_track_left_large_half_loop_down(
 }
 
 static void vertical_drop_rc_track_90_deg_to_inverted_flat_quarter_loop_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_90_deg_to_inverted_flat_quarter_loop_up(
@@ -2287,11 +1579,7 @@ static void vertical_drop_rc_track_90_deg_to_inverted_flat_quarter_loop_up(
 }
 
 static void vertical_drop_rc_track_inverted_flat_to_90_deg_quarter_loop_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_inverted_flat_to_90_deg_quarter_loop_down(
@@ -2299,11 +1587,7 @@ static void vertical_drop_rc_track_inverted_flat_to_90_deg_quarter_loop_down(
 }
 
 static void vertical_drop_rc_track_booster(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bolliger_mabillard_track_booster(session, rideIndex, trackSequence, direction, height, tileElement, METAL_SUPPORTS_BOXED);
diff --git a/src/openrct2/ride/coaster/VirginiaReel.cpp b/src/openrct2/ride/coaster/VirginiaReel.cpp
index 54ccff0ae7..eccfec8acb 100644
--- a/src/openrct2/ride/coaster/VirginiaReel.cpp
+++ b/src/openrct2/ride/coaster/VirginiaReel.cpp
@@ -130,17 +130,13 @@ static constexpr const uint32_t virginia_reel_track_pieces_25_deg_up_lift_hill[4
 };
 
 static constexpr const uint32_t virginia_reel_track_pieces_flat_quarter_turn_3_tiles[4][3] = {
-    { SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_0,
-      SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_1,
+    { SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_1,
       SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_2 },
-    { SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_0,
-      SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_1,
+    { SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_1,
       SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_2 },
-    { SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_0,
-      SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_1,
+    { SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_0, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_1,
       SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_2 },
-    { SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_0,
-      SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_1,
+    { SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_0, SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_1,
       SPR_VIRGINIA_REEL_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_2 }
 };
 
@@ -156,12 +152,7 @@ static constexpr const uint32_t virginia_reel_track_pieces_flat_quarter_turn_1_t
  *  rct2: 0x006D5B48
  */
 void vehicle_visual_virginia_reel(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     int32_t image_id;
@@ -223,16 +214,7 @@ void vehicle_visual_virginia_reel(
             {
                 image_id = (baseImage_id + ((i + 1) * 72)) | SPRITE_ID_PALETTE_COLOUR_1(riding_peep_sprites[i]);
                 sub_98199C(
-                    session,
-                    image_id,
-                    0,
-                    0,
-                    bb->length_x,
-                    bb->length_y,
-                    bb->length_z,
-                    z,
-                    bb->offset_x,
-                    bb->offset_y,
+                    session, image_id, 0, 0, bb->length_x, bb->length_y, bb->length_z, z, bb->offset_x, bb->offset_y,
                     bb->offset_z + z);
             }
         }
@@ -243,11 +225,7 @@ void vehicle_visual_virginia_reel(
 
 /** rct2: 0x00811264 */
 static void paint_virginia_reel_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const uint32_t* sprites = virginia_reel_track_pieces_flat;
@@ -276,11 +254,7 @@ static void paint_virginia_reel_track_flat(
 
 /** rct2: 0x00811274 */
 static void paint_virginia_reel_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const uint32_t* sprites = virginia_reel_track_pieces_25_deg_up;
@@ -332,11 +306,7 @@ static void paint_virginia_reel_track_25_deg_up(
 
 /** rct2: 0x00811294 */
 static void paint_virginia_reel_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const uint32_t* sprites = virginia_reel_track_pieces_flat_to_25_deg_up;
@@ -383,11 +353,7 @@ static void paint_virginia_reel_track_flat_to_25_deg_up(
 
 /** rct2: 0x00811294 */
 static void paint_virginia_reel_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const uint32_t* sprites = virginia_reel_track_pieces_25_deg_up_to_flat;
@@ -439,11 +405,7 @@ static void paint_virginia_reel_track_25_deg_up_to_flat(
 
 /** rct2: 0x008112A4 */
 static void paint_virginia_reel_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_virginia_reel_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -451,11 +413,7 @@ static void paint_virginia_reel_track_25_deg_down(
 
 /** rct2: 0x008112B4 */
 static void paint_virginia_reel_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_virginia_reel_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -463,11 +421,7 @@ static void paint_virginia_reel_track_flat_to_25_deg_down(
 
 /** rct2: 0x008112C4 */
 static void paint_virginia_reel_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_virginia_reel_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -475,11 +429,7 @@ static void paint_virginia_reel_track_25_deg_down_to_flat(
 
 /** rct2: 0x008112D4, 0x008112E4, 0x008112F4 */
 static void paint_virginia_reel_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -516,20 +466,11 @@ static constexpr const uint8_t virginia_reel_left_quarter_turn_supports[] = { 5,
 
 /** rct2: 0x00811304 */
 static void paint_virginia_reel_track_left_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_left_quarter_turn_3_tiles_paint(
-        session,
-        2,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
+        session, 2, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
         virginia_reel_track_pieces_flat_quarter_turn_3_tiles);
     track_paint_util_left_quarter_turn_3_tiles_tunnel(session, height, TUNNEL_6, direction, trackSequence);
 
@@ -542,11 +483,7 @@ static void paint_virginia_reel_track_left_quarter_turn_3_tiles(
         case 0:
         case 3:
             wooden_a_supports_paint_setup(
-                session,
-                virginia_reel_left_quarter_turn_supports[direction],
-                0,
-                height,
-                session->TrackColours[SCHEME_SUPPORTS],
+                session, virginia_reel_left_quarter_turn_supports[direction], 0, height, session->TrackColours[SCHEME_SUPPORTS],
                 nullptr);
             paint_util_set_segment_support_height(session, paint_util_rotate_segments(SEGMENTS_ALL, direction), 0xFFFF, 0);
             break;
@@ -559,11 +496,7 @@ static constexpr const uint8_t virginia_reel_right_quarter_turn_3_tiles_to_left_
 
 /** rct2: 0x00811314 */
 static void paint_virginia_reel_track_right_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = virginia_reel_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence];
@@ -573,20 +506,11 @@ static void paint_virginia_reel_track_right_quarter_turn_3_tiles(
 
 /** rct2: 0x00811324 */
 static void paint_virginia_reel_track_left_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_left_quarter_turn_1_tile_paint(
-        session,
-        2,
-        height,
-        0,
-        direction,
-        session->TrackColours[SCHEME_TRACK],
+        session, 2, height, 0, direction, session->TrackColours[SCHEME_TRACK],
         virginia_reel_track_pieces_flat_quarter_turn_1_tile);
 
     switch (direction)
@@ -615,11 +539,7 @@ static void paint_virginia_reel_track_left_quarter_turn_1_tile(
 
 /** rct2: 0x00811334 */
 static void paint_virginia_reel_track_right_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_virginia_reel_track_left_quarter_turn_1_tile(
diff --git a/src/openrct2/ride/coaster/WildMouse.cpp b/src/openrct2/ride/coaster/WildMouse.cpp
index 214471ea4f..1bef691290 100644
--- a/src/openrct2/ride/coaster/WildMouse.cpp
+++ b/src/openrct2/ride/coaster/WildMouse.cpp
@@ -164,11 +164,7 @@ static constexpr const uint32_t _wild_mouse_block_brakes_image_ids[4] = {
 
 /** rct2: 0x0078B1E4 */
 static void wild_mouse_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -192,11 +188,7 @@ static void wild_mouse_track_flat(
 }
 
 static void wild_mouse_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t baseImageIds[4] = {
@@ -208,49 +200,19 @@ static void wild_mouse_track_station(
 
     int32_t trackType = track_element_get_type(tileElement);
     sub_98197C_rotated(
-        session,
-        direction,
-        baseImageIds[direction] | session->TrackColours[SCHEME_MISC],
-        0,
-        0,
-        32,
-        28,
-        2,
-        height - 2,
-        0,
-        2,
+        session, direction, baseImageIds[direction] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 28, 2, height - 2, 0, 2,
         height);
     if (trackType == TRACK_ELEM_END_STATION)
     {
         sub_98199C_rotated(
-            session,
-            direction,
-            _wild_mouse_block_brakes_image_ids[direction] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            2,
-            height,
-            0,
-            0,
-            height);
+            session, direction, _wild_mouse_block_brakes_image_ids[direction] | session->TrackColours[SCHEME_TRACK], 0, 0, 32,
+            20, 2, height, 0, 0, height);
     }
     else
     {
         sub_98199C_rotated(
-            session,
-            direction,
-            _wild_mouse_brakes_image_ids[direction] | session->TrackColours[SCHEME_TRACK],
-            0,
-            0,
-            32,
-            20,
-            2,
-            height,
-            0,
-            0,
-            height);
+            session, direction, _wild_mouse_brakes_image_ids[direction] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 2,
+            height, 0, 0, height);
     }
     track_paint_util_draw_station_metal_supports(session, direction, height, session->TrackColours[SCHEME_SUPPORTS]);
     track_paint_util_draw_station(session, rideIndex, direction, height, tileElement);
@@ -261,11 +223,7 @@ static void wild_mouse_track_station(
 
 /** rct2: 0x0078B1F4 */
 static void wild_mouse_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -297,11 +255,7 @@ static void wild_mouse_track_25_deg_up(
 
 /** rct2: 0x0078B204 */
 static void wild_mouse_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -347,11 +301,7 @@ static void wild_mouse_track_60_deg_up(
 
 /** rct2: 0x0078B214 */
 static void wild_mouse_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -383,11 +333,7 @@ static void wild_mouse_track_flat_to_25_deg_up(
 
 /** rct2: 0x0078B224 */
 static void wild_mouse_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -434,11 +380,7 @@ static void wild_mouse_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x0078B234 */
 static void wild_mouse_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -485,11 +427,7 @@ static void wild_mouse_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x0078B244 */
 static void wild_mouse_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -521,11 +459,7 @@ static void wild_mouse_track_25_deg_up_to_flat(
 
 /** rct2: 0x0078B254 */
 static void wild_mouse_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wild_mouse_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -533,11 +467,7 @@ static void wild_mouse_track_25_deg_down(
 
 /** rct2: 0x0078B264 */
 static void wild_mouse_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wild_mouse_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -545,11 +475,7 @@ static void wild_mouse_track_60_deg_down(
 
 /** rct2: 0x0078B274 */
 static void wild_mouse_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wild_mouse_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -557,11 +483,7 @@ static void wild_mouse_track_flat_to_25_deg_down(
 
 /** rct2: 0x0078B284 */
 static void wild_mouse_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wild_mouse_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -569,11 +491,7 @@ static void wild_mouse_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x0078B294 */
 static void wild_mouse_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wild_mouse_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -581,22 +499,14 @@ static void wild_mouse_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x0078B2A4 */
 static void wild_mouse_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wild_mouse_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void wild_mouse_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const sprite_bb imageIds[4][3] = {
@@ -652,11 +562,7 @@ static void wild_mouse_track_right_quarter_turn_3(
 }
 
 static void wild_mouse_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const sprite_bb imageIds[4][2] = {
@@ -684,14 +590,8 @@ 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(
-            session,
-            sbb->sprite_id | session->TrackColours[SCHEME_TRACK],
-            (int8_t)sbb->offset.x,
-            (int8_t)sbb->offset.y,
-            sbb->bb_size.x,
-            sbb->bb_size.y,
-            (int8_t)sbb->bb_size.z,
-            height + (int8_t)sbb->offset.z);
+            session, sbb->sprite_id | session->TrackColours[SCHEME_TRACK], (int8_t)sbb->offset.x, (int8_t)sbb->offset.y,
+            sbb->bb_size.x, sbb->bb_size.y, (int8_t)sbb->bb_size.z, height + (int8_t)sbb->offset.z);
     }
 
     track_paint_util_right_quarter_turn_3_tiles_25_deg_down_tunnel(
@@ -720,11 +620,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_down(
 }
 
 static void wild_mouse_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -734,11 +630,7 @@ static void wild_mouse_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x0078B314 */
 static void wild_mouse_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const sprite_bb imageIds[4][2] = {
@@ -766,14 +658,8 @@ 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(
-            session,
-            sbb->sprite_id | session->TrackColours[SCHEME_TRACK],
-            (int8_t)sbb->offset.x,
-            (int8_t)sbb->offset.y,
-            sbb->bb_size.x,
-            sbb->bb_size.y,
-            (int8_t)sbb->bb_size.z,
-            height + (int8_t)sbb->offset.z);
+            session, sbb->sprite_id | session->TrackColours[SCHEME_TRACK], (int8_t)sbb->offset.x, (int8_t)sbb->offset.y,
+            sbb->bb_size.x, sbb->bb_size.y, (int8_t)sbb->bb_size.z, height + (int8_t)sbb->offset.z);
     }
 
     track_paint_util_right_quarter_turn_3_tiles_25_deg_up_tunnel(session, height, direction, trackSequence, TUNNEL_1, TUNNEL_2);
@@ -813,11 +699,7 @@ static void wild_mouse_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x0078B324 */
 static void wild_mouse_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -826,11 +708,7 @@ static void wild_mouse_track_left_quarter_turn_3_25_deg_down(
 }
 
 static void wild_mouse_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -839,11 +717,7 @@ static void wild_mouse_track_left_quarter_turn_3(
 
 /** rct2: 0x0078B394 */
 static void wild_mouse_track_left_quarter_turn_1(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4] = {
@@ -878,11 +752,7 @@ static void wild_mouse_track_left_quarter_turn_1(
 
 /** rct2: 0x0078B3A4 */
 static void wild_mouse_track_right_quarter_turn_1(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wild_mouse_track_left_quarter_turn_1(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement);
@@ -890,11 +760,7 @@ static void wild_mouse_track_right_quarter_turn_1(
 
 /** rct2: 0x0078B354 */
 static void wild_mouse_track_flat_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -941,11 +807,7 @@ static void wild_mouse_track_flat_to_60_deg_up(
 
 /** rct2: 0x0078B364 */
 static void wild_mouse_track_60_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -999,11 +861,7 @@ static void wild_mouse_track_60_deg_up_to_flat(
 
 /** rct2: 0x0078B374 */
 static void wild_mouse_track_flat_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wild_mouse_track_60_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1011,11 +869,7 @@ static void wild_mouse_track_flat_to_60_deg_down(
 
 /** rct2: 0x0078B384 */
 static void wild_mouse_track_60_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wild_mouse_track_flat_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1023,11 +877,7 @@ static void wild_mouse_track_60_deg_down_to_flat(
 
 /** rct2: 0x0078B344 */
 static void wild_mouse_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = _wild_mouse_brakes_image_ids[direction] | session->TrackColours[SCHEME_TRACK];
@@ -1044,11 +894,7 @@ static void wild_mouse_track_brakes(
 
 /** rct2: 0x0078B3C4 */
 static void wild_mouse_track_rotation_control_toggle(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4] = {
@@ -1072,11 +918,7 @@ static void wild_mouse_track_rotation_control_toggle(
 
 /** rct2: 0x0078B3B4 */
 static void wild_mouse_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = _wild_mouse_block_brakes_image_ids[direction] | session->TrackColours[SCHEME_TRACK];
diff --git a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp
index 072d935d3b..25762f78df 100644
--- a/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp
+++ b/src/openrct2/ride/coaster/WoodenRollerCoaster.cpp
@@ -401,49 +401,19 @@ static uint32_t wooden_rc_get_rails_colour(paint_session* session)
 }
 
 static paint_struct* wooden_rc_track_paint(
-    paint_session* session,
-    uint32_t imageIdTrack,
-    uint32_t imageIdRails,
-    uint8_t direction,
-    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,
-    int16_t bound_box_offset_y,
-    int16_t bound_box_offset_z)
+    paint_session* session, uint32_t imageIdTrack, uint32_t imageIdRails, uint8_t direction, 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, int16_t bound_box_offset_y, int16_t bound_box_offset_z)
 {
     uint32_t imageId = imageIdTrack | wooden_rc_get_track_colour(session);
     uint32_t railsImageId = imageIdRails | wooden_rc_get_rails_colour(session);
 
     sub_98197C_rotated(
-        session,
-        direction,
-        imageId,
-        x_offset,
-        y_offset,
-        bound_box_length_x,
-        bound_box_length_y,
-        bound_box_length_z,
-        z_offset,
-        bound_box_offset_x,
-        bound_box_offset_y,
-        bound_box_offset_z);
+        session, direction, imageId, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset,
+        bound_box_offset_x, bound_box_offset_y, bound_box_offset_z);
     return sub_98199C_rotated(
-        session,
-        direction,
-        railsImageId,
-        x_offset,
-        y_offset,
-        bound_box_length_x,
-        bound_box_length_y,
-        bound_box_length_z,
-        z_offset,
-        bound_box_offset_x,
-        bound_box_offset_y,
-        bound_box_offset_z);
+        session, direction, railsImageId, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z,
+        z_offset, bound_box_offset_x, bound_box_offset_y, bound_box_offset_z);
 }
 
 static void wooden_rc_track_paint_bb(paint_session* session, const sprite_bb_2* bb, int16_t height)
@@ -455,38 +425,16 @@ static void wooden_rc_track_paint_bb(paint_session* session, const sprite_bb_2*
     uint32_t railsImageId = bb->sprite_id_b | wooden_rc_get_rails_colour(session);
 
     sub_98197C(
-        session,
-        imageId,
-        (int8_t)bb->offset.x,
-        (int8_t)bb->offset.y,
-        bb->bb_size.x,
-        bb->bb_size.y,
-        (int8_t)bb->bb_size.z,
-        height + bb->offset.z,
-        bb->bb_offset.x,
-        bb->bb_offset.y,
-        height + bb->bb_offset.z);
+        session, imageId, (int8_t)bb->offset.x, (int8_t)bb->offset.y, bb->bb_size.x, bb->bb_size.y, (int8_t)bb->bb_size.z,
+        height + bb->offset.z, bb->bb_offset.x, bb->bb_offset.y, height + bb->bb_offset.z);
     sub_98199C(
-        session,
-        railsImageId,
-        (int8_t)bb->offset.x,
-        (int8_t)bb->offset.y,
-        bb->bb_size.x,
-        bb->bb_size.y,
-        (int8_t)bb->bb_size.z,
-        height + bb->offset.z,
-        bb->bb_offset.x,
-        bb->bb_offset.y,
-        height + bb->bb_offset.z);
+        session, railsImageId, (int8_t)bb->offset.x, (int8_t)bb->offset.y, bb->bb_size.x, bb->bb_size.y, (int8_t)bb->bb_size.z,
+        height + bb->offset.z, bb->bb_offset.x, bb->bb_offset.y, height + bb->bb_offset.z);
 }
 
 /** rct2: 0x008AC568 */
 static void wooden_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -504,18 +452,7 @@ static void wooden_rc_track_flat(
 
     uint8_t isChained = track_element_is_lift_hill(tileElement) ? 1 : 0;
     wooden_rc_track_paint(
-        session,
-        imageIds[direction][isChained],
-        railsImageIds[direction][isChained],
-        direction,
-        0,
-        2,
-        32,
-        25,
-        2,
-        height,
-        0,
-        3,
+        session, imageIds[direction][isChained], railsImageIds[direction][isChained], direction, 0, 2, 32, 25, 2, height, 0, 3,
         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_6);
@@ -524,11 +461,7 @@ static void wooden_rc_track_flat(
 }
 
 static void wooden_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t stationImageIds[4][2] = {
@@ -542,35 +475,13 @@ static void wooden_rc_track_station(
     if (trackType == TRACK_ELEM_END_STATION)
     {
         wooden_rc_track_paint(
-            session,
-            _wooden_rc_block_brakes_image_ids[direction][0],
-            _wooden_rc_block_brakes_image_ids[direction][1],
-            direction,
-            0,
-            2,
-            32,
-            27,
-            2,
-            height,
-            0,
-            2,
-            height);
+            session, _wooden_rc_block_brakes_image_ids[direction][0], _wooden_rc_block_brakes_image_ids[direction][1],
+            direction, 0, 2, 32, 27, 2, height, 0, 2, height);
     }
     else
     {
         wooden_rc_track_paint(
-            session,
-            stationImageIds[direction][0],
-            stationImageIds[direction][1],
-            direction,
-            0,
-            2,
-            32,
-            27,
-            2,
-            height,
-            0,
-            2,
+            session, stationImageIds[direction][0], stationImageIds[direction][1], direction, 0, 2, 32, 27, 2, height, 0, 2,
             height);
     }
     wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
@@ -582,35 +493,23 @@ static void wooden_rc_track_station(
 
 /** rct2: 0x008AC578 */
 static void wooden_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4][4] = {
         {
             { SPR_WOODEN_RC_25_DEG_SW_NE, SPR_WOODEN_RC_25_DEG_RAILS_SW_NE, 0, 0 },
-            { SPR_WOODEN_RC_25_DEG_NW_SE,
-              SPR_WOODEN_RC_25_DEG_RAILS_NW_SE,
-              SPR_WOODEN_RC_25_DEG_FRONT_NW_SE,
+            { SPR_WOODEN_RC_25_DEG_NW_SE, SPR_WOODEN_RC_25_DEG_RAILS_NW_SE, SPR_WOODEN_RC_25_DEG_FRONT_NW_SE,
               SPR_WOODEN_RC_25_DEG_RAILS_FRONT_NW_SE },
-            { SPR_WOODEN_RC_25_DEG_NE_SW,
-              SPR_WOODEN_RC_25_DEG_RAILS_NE_SW,
-              SPR_WOODEN_RC_25_DEG_FRONT_NE_SW,
+            { SPR_WOODEN_RC_25_DEG_NE_SW, SPR_WOODEN_RC_25_DEG_RAILS_NE_SW, SPR_WOODEN_RC_25_DEG_FRONT_NE_SW,
               SPR_WOODEN_RC_25_DEG_RAILS_FRONT_NE_SW },
             { SPR_WOODEN_RC_25_DEG_SE_NW, SPR_WOODEN_RC_25_DEG_RAILS_SE_NW, 0, 0 },
         },
         {
             { SPR_WOODEN_RC_25_DEG_CHAIN_SW_NE, SPR_WOODEN_RC_25_DEG_CHAIN_RAILS_SW_NE, 0, 0 },
-            { SPR_WOODEN_RC_25_DEG_CHAIN_NW_SE,
-              SPR_WOODEN_RC_25_DEG_CHAIN_RAILS_NW_SE,
-              SPR_WOODEN_RC_25_DEG_CHAIN_FRONT_NW_SE,
+            { SPR_WOODEN_RC_25_DEG_CHAIN_NW_SE, SPR_WOODEN_RC_25_DEG_CHAIN_RAILS_NW_SE, SPR_WOODEN_RC_25_DEG_CHAIN_FRONT_NW_SE,
               SPR_WOODEN_RC_25_DEG_CHAIN_RAILS_FRONT_NW_SE },
-            { SPR_WOODEN_RC_25_DEG_CHAIN_NE_SW,
-              SPR_WOODEN_RC_25_DEG_CHAIN_RAILS_NE_SW,
-              SPR_WOODEN_RC_25_DEG_CHAIN_FRONT_NE_SW,
+            { SPR_WOODEN_RC_25_DEG_CHAIN_NE_SW, SPR_WOODEN_RC_25_DEG_CHAIN_RAILS_NE_SW, SPR_WOODEN_RC_25_DEG_CHAIN_FRONT_NE_SW,
               SPR_WOODEN_RC_25_DEG_CHAIN_RAILS_FRONT_NE_SW },
             { SPR_WOODEN_RC_25_DEG_CHAIN_SE_NW, SPR_WOODEN_RC_25_DEG_CHAIN_RAILS_SE_NW, 0, 0 },
         }
@@ -618,35 +517,13 @@ static void wooden_rc_track_25_deg_up(
 
     uint8_t isChained = track_element_is_lift_hill(tileElement) ? 1 : 0;
     wooden_rc_track_paint(
-        session,
-        imageIds[isChained][direction][0],
-        imageIds[isChained][direction][1],
-        direction,
-        0,
-        0,
-        32,
-        25,
-        2,
-        height,
-        0,
-        3,
+        session, imageIds[isChained][direction][0], imageIds[isChained][direction][1], direction, 0, 0, 32, 25, 2, height, 0, 3,
         height);
     if (direction == 1 || direction == 2)
     {
         wooden_rc_track_paint(
-            session,
-            imageIds[isChained][direction][2],
-            imageIds[isChained][direction][3],
-            direction,
-            0,
-            0,
-            32,
-            1,
-            9,
-            height,
-            0,
-            26,
-            height + 5);
+            session, imageIds[isChained][direction][2], imageIds[isChained][direction][3], direction, 0, 0, 32, 1, 9, height, 0,
+            26, height + 5);
     }
     wooden_a_supports_paint_setup(
         session, direction & 1, 9 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
@@ -666,11 +543,7 @@ static void wooden_rc_track_25_deg_up(
 
 /** rct2: 0x008AC588 */
 static void wooden_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -708,71 +581,37 @@ static void wooden_rc_track_60_deg_up(
 
 /** rct2: 0x008AC598 */
 static void wooden_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4][4] = {
         {
             { SPR_WOODEN_RC_FLAT_TO_25_DEG_SW_NE, SPR_WOODEN_RC_FLAT_TO_25_DEG_RAILS_SW_NE, 0, 0 },
-            { SPR_WOODEN_RC_FLAT_TO_25_DEG_NW_SE,
-              SPR_WOODEN_RC_FLAT_TO_25_DEG_RAILS_NW_SE,
-              SPR_WOODEN_RC_FLAT_TO_25_DEG_FRONT_NW_SE,
-              SPR_WOODEN_RC_FLAT_TO_25_DEG_RAILS_FRONT_NW_SE },
-            { SPR_WOODEN_RC_FLAT_TO_25_DEG_NE_SW,
-              SPR_WOODEN_RC_FLAT_TO_25_DEG_RAILS_NE_SW,
-              SPR_WOODEN_RC_FLAT_TO_25_DEG_FRONT_NE_SW,
-              SPR_WOODEN_RC_FLAT_TO_25_DEG_RAILS_FRONT_NE_SW },
+            { SPR_WOODEN_RC_FLAT_TO_25_DEG_NW_SE, SPR_WOODEN_RC_FLAT_TO_25_DEG_RAILS_NW_SE,
+              SPR_WOODEN_RC_FLAT_TO_25_DEG_FRONT_NW_SE, SPR_WOODEN_RC_FLAT_TO_25_DEG_RAILS_FRONT_NW_SE },
+            { SPR_WOODEN_RC_FLAT_TO_25_DEG_NE_SW, SPR_WOODEN_RC_FLAT_TO_25_DEG_RAILS_NE_SW,
+              SPR_WOODEN_RC_FLAT_TO_25_DEG_FRONT_NE_SW, SPR_WOODEN_RC_FLAT_TO_25_DEG_RAILS_FRONT_NE_SW },
             { SPR_WOODEN_RC_FLAT_TO_25_DEG_SE_NW, SPR_WOODEN_RC_FLAT_TO_25_DEG_RAILS_SE_NW, 0, 0 },
         },
         {
             { SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_SW_NE, SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_RAILS_SW_NE, 0, 0 },
-            { SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_NW_SE,
-              SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_RAILS_NW_SE,
-              SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_FRONT_NW_SE,
-              SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_RAILS_FRONT_NW_SE },
-            { SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_NE_SW,
-              SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_RAILS_NE_SW,
-              SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_FRONT_NE_SW,
-              SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_RAILS_FRONT_NE_SW },
+            { SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_NW_SE, SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_RAILS_NW_SE,
+              SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_FRONT_NW_SE, SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_RAILS_FRONT_NW_SE },
+            { SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_NE_SW, SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_RAILS_NE_SW,
+              SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_FRONT_NE_SW, SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_RAILS_FRONT_NE_SW },
             { SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_SE_NW, SPR_WOODEN_RC_FLAT_TO_25_DEG_CHAIN_RAILS_SE_NW, 0, 0 },
         }
     };
 
     uint8_t isChained = track_element_is_lift_hill(tileElement) ? 1 : 0;
     wooden_rc_track_paint(
-        session,
-        imageIds[isChained][direction][0],
-        imageIds[isChained][direction][1],
-        direction,
-        0,
-        0,
-        32,
-        25,
-        2,
-        height,
-        0,
-        3,
+        session, imageIds[isChained][direction][0], imageIds[isChained][direction][1], direction, 0, 0, 32, 25, 2, height, 0, 3,
         height);
     if (direction == 1 || direction == 2)
     {
         wooden_rc_track_paint(
-            session,
-            imageIds[isChained][direction][2],
-            imageIds[isChained][direction][3],
-            direction,
-            0,
-            0,
-            32,
-            1,
-            9,
-            height,
-            0,
-            26,
-            height + 5);
+            session, imageIds[isChained][direction][2], imageIds[isChained][direction][3], direction, 0, 0, 32, 1, 9, height, 0,
+            26, height + 5);
     }
     wooden_a_supports_paint_setup(
         session, direction & 1, 1 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
@@ -792,23 +631,15 @@ static void wooden_rc_track_flat_to_25_deg_up(
 
 /** rct2: 0x008AC5A8 */
 static void wooden_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4] = {
         { SPR_WOODEN_RC_25_DEG_TO_60_DEG_SW_NE, SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_SW_NE, 0, 0 },
-        { SPR_WOODEN_RC_25_DEG_TO_60_DEG_NW_SE,
-          SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_NW_SE,
-          SPR_WOODEN_RC_25_DEG_TO_60_DEG_FRONT_NW_SE,
-          SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_FRONT_NW_SE },
-        { SPR_WOODEN_RC_25_DEG_TO_60_DEG_NE_SW,
-          SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_NE_SW,
-          SPR_WOODEN_RC_25_DEG_TO_60_DEG_FRONT_NE_SW,
-          SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_FRONT_NE_SW },
+        { SPR_WOODEN_RC_25_DEG_TO_60_DEG_NW_SE, SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_NW_SE,
+          SPR_WOODEN_RC_25_DEG_TO_60_DEG_FRONT_NW_SE, SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_FRONT_NW_SE },
+        { SPR_WOODEN_RC_25_DEG_TO_60_DEG_NE_SW, SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_NE_SW,
+          SPR_WOODEN_RC_25_DEG_TO_60_DEG_FRONT_NE_SW, SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_FRONT_NE_SW },
         { SPR_WOODEN_RC_25_DEG_TO_60_DEG_SE_NW, SPR_WOODEN_RC_25_DEG_TO_60_DEG_RAILS_SE_NW, 0, 0 },
     };
 
@@ -842,23 +673,15 @@ static void wooden_rc_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008AC5B8 */
 static void wooden_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4] = {
         { SPR_WOODEN_RC_60_DEG_TO_25_DEG_SW_NE, SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_SW_NE, 0, 0 },
-        { SPR_WOODEN_RC_60_DEG_TO_25_DEG_NW_SE,
-          SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_NW_SE,
-          SPR_WOODEN_RC_60_DEG_TO_25_DEG_FRONT_NW_SE,
-          SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_FRONT_NW_SE },
-        { SPR_WOODEN_RC_60_DEG_TO_25_DEG_NE_SW,
-          SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_NE_SW,
-          SPR_WOODEN_RC_60_DEG_TO_25_DEG_FRONT_NE_SW,
-          SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_FRONT_NE_SW },
+        { SPR_WOODEN_RC_60_DEG_TO_25_DEG_NW_SE, SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_NW_SE,
+          SPR_WOODEN_RC_60_DEG_TO_25_DEG_FRONT_NW_SE, SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_FRONT_NW_SE },
+        { SPR_WOODEN_RC_60_DEG_TO_25_DEG_NE_SW, SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_NE_SW,
+          SPR_WOODEN_RC_60_DEG_TO_25_DEG_FRONT_NE_SW, SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_FRONT_NE_SW },
         { SPR_WOODEN_RC_60_DEG_TO_25_DEG_SE_NW, SPR_WOODEN_RC_60_DEG_TO_25_DEG_RAILS_SE_NW, 0, 0 },
     };
 
@@ -892,71 +715,37 @@ static void wooden_rc_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008AC5C8 */
 static void wooden_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4][4] = {
         {
             { SPR_WOODEN_RC_25_DEG_TO_FLAT_SW_NE, SPR_WOODEN_RC_25_DEG_TO_FLAT_RAILS_SW_NE, 0, 0 },
-            { SPR_WOODEN_RC_25_DEG_TO_FLAT_NW_SE,
-              SPR_WOODEN_RC_25_DEG_TO_FLAT_RAILS_NW_SE,
-              SPR_WOODEN_RC_25_DEG_TO_FLAT_FRONT_NW_SE,
-              SPR_WOODEN_RC_25_DEG_TO_FLAT_RAILS_FRONT_NW_SE },
-            { SPR_WOODEN_RC_25_DEG_TO_FLAT_NE_SW,
-              SPR_WOODEN_RC_25_DEG_TO_FLAT_RAILS_NE_SW,
-              SPR_WOODEN_RC_25_DEG_TO_FLAT_FRONT_NE_SW,
-              SPR_WOODEN_RC_25_DEG_TO_FLAT_RAILS_FRONT_NE_SW },
+            { SPR_WOODEN_RC_25_DEG_TO_FLAT_NW_SE, SPR_WOODEN_RC_25_DEG_TO_FLAT_RAILS_NW_SE,
+              SPR_WOODEN_RC_25_DEG_TO_FLAT_FRONT_NW_SE, SPR_WOODEN_RC_25_DEG_TO_FLAT_RAILS_FRONT_NW_SE },
+            { SPR_WOODEN_RC_25_DEG_TO_FLAT_NE_SW, SPR_WOODEN_RC_25_DEG_TO_FLAT_RAILS_NE_SW,
+              SPR_WOODEN_RC_25_DEG_TO_FLAT_FRONT_NE_SW, SPR_WOODEN_RC_25_DEG_TO_FLAT_RAILS_FRONT_NE_SW },
             { SPR_WOODEN_RC_25_DEG_TO_FLAT_SE_NW, SPR_WOODEN_RC_25_DEG_TO_FLAT_RAILS_SE_NW, 0, 0 },
         },
         {
             { SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_SW_NE, SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_RAILS_SW_NE, 0, 0 },
-            { SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_NW_SE,
-              SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_RAILS_NW_SE,
-              SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_FRONT_NW_SE,
-              SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_RAILS_FRONT_NW_SE },
-            { SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_NE_SW,
-              SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_RAILS_NE_SW,
-              SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_FRONT_NE_SW,
-              SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_RAILS_FRONT_NE_SW },
+            { SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_NW_SE, SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_RAILS_NW_SE,
+              SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_FRONT_NW_SE, SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_RAILS_FRONT_NW_SE },
+            { SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_NE_SW, SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_RAILS_NE_SW,
+              SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_FRONT_NE_SW, SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_RAILS_FRONT_NE_SW },
             { SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_SE_NW, SPR_WOODEN_RC_25_DEG_TO_FLAT_CHAIN_RAILS_SE_NW, 0, 0 },
         }
     };
 
     uint8_t isChained = track_element_is_lift_hill(tileElement) ? 1 : 0;
     wooden_rc_track_paint(
-        session,
-        imageIds[isChained][direction][0],
-        imageIds[isChained][direction][1],
-        direction,
-        0,
-        0,
-        32,
-        25,
-        2,
-        height,
-        0,
-        3,
+        session, imageIds[isChained][direction][0], imageIds[isChained][direction][1], direction, 0, 0, 32, 25, 2, height, 0, 3,
         height);
     if (direction == 1 || direction == 2)
     {
         wooden_rc_track_paint(
-            session,
-            imageIds[isChained][direction][2],
-            imageIds[isChained][direction][3],
-            direction,
-            0,
-            0,
-            32,
-            1,
-            9,
-            height,
-            0,
-            26,
-            height + 5);
+            session, imageIds[isChained][direction][2], imageIds[isChained][direction][3], direction, 0, 0, 32, 1, 9, height, 0,
+            26, height + 5);
     }
     wooden_a_supports_paint_setup(
         session, direction & 1, 5 + direction, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
@@ -976,11 +765,7 @@ static void wooden_rc_track_25_deg_up_to_flat(
 
 /** rct2: 0x008AC5D8 */
 static void wooden_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -988,11 +773,7 @@ static void wooden_rc_track_25_deg_down(
 
 /** rct2: 0x008AC5E8 */
 static void wooden_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1000,11 +781,7 @@ static void wooden_rc_track_60_deg_down(
 
 /** rct2: 0x008AC5F8 */
 static void wooden_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1012,11 +789,7 @@ static void wooden_rc_track_flat_to_25_deg_down(
 
 /** rct2: 0x008AC608 */
 static void wooden_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1024,11 +797,7 @@ static void wooden_rc_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008AC618 */
 static void wooden_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1036,22 +805,14 @@ static void wooden_rc_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008AC628 */
 static void wooden_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void wooden_rc_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const sprite_bb_2 imageIds[2][4][7] = {
@@ -1297,11 +1058,7 @@ static void wooden_rc_track_right_quarter_turn_5(
 }
 
 static void wooden_rc_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1310,24 +1067,16 @@ static void wooden_rc_track_left_quarter_turn_5(
 
 /** rct2: 0x008AC658 */
 static void wooden_rc_track_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4] = {
         { SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_SW_NE, SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_RAILS_SW_NE, 0, 0 },
-        { SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_NW_SE,
-          SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_RAILS_NW_SE,
-          SPR_WOODEN_RC_RC_FLAT_TO_LEFT_BANK_FRONT_NW_SE,
-          SPR_WOODEN_RC_RC_FLAT_TO_LEFT_BANK_RAILS_FRONT_NW_SE },
+        { SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_NW_SE, SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_RAILS_NW_SE,
+          SPR_WOODEN_RC_RC_FLAT_TO_LEFT_BANK_FRONT_NW_SE, SPR_WOODEN_RC_RC_FLAT_TO_LEFT_BANK_RAILS_FRONT_NW_SE },
         { SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_NE_SW, SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_RAILS_NE_SW, 0, 0 },
-        { SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_SE_NW,
-          SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_RAILS_SE_NW,
-          SPR_WOODEN_RC_RC_FLAT_TO_LEFT_BANK_FRONT_SE_NW,
-          SPR_WOODEN_RC_RC_FLAT_TO_LEFT_BANK_RAILS_FRONT_SE_NW },
+        { SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_SE_NW, SPR_WOODEN_RC_FLAT_TO_LEFT_BANK_RAILS_SE_NW,
+          SPR_WOODEN_RC_RC_FLAT_TO_LEFT_BANK_FRONT_SE_NW, SPR_WOODEN_RC_RC_FLAT_TO_LEFT_BANK_RAILS_FRONT_SE_NW },
     };
 
     wooden_rc_track_paint(
@@ -1345,23 +1094,15 @@ static void wooden_rc_track_flat_to_left_bank(
 
 /** rct2: 0x008AC668 */
 static void wooden_rc_track_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4] = {
-        { SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_SW_NE,
-          SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_RAILS_SW_NE,
-          SPR_WOODEN_RC_RC_FLAT_TO_RIGHT_BANK_FRONT_SW_NE,
-          SPR_WOODEN_RC_RC_FLAT_TO_RIGHT_BANK_RAILS_FRONT_SW_NE },
+        { SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_SW_NE, SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_RAILS_SW_NE,
+          SPR_WOODEN_RC_RC_FLAT_TO_RIGHT_BANK_FRONT_SW_NE, SPR_WOODEN_RC_RC_FLAT_TO_RIGHT_BANK_RAILS_FRONT_SW_NE },
         { SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_NW_SE, SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_RAILS_NW_SE, 0, 0 },
-        { SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_NE_SW,
-          SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_RAILS_NE_SW,
-          SPR_WOODEN_RC_RC_FLAT_TO_RIGHT_BANK_FRONT_NE_SW,
-          SPR_WOODEN_RC_RC_FLAT_TO_RIGHT_BANK_RAILS_FRONT_NE_SW },
+        { SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_NE_SW, SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_RAILS_NE_SW,
+          SPR_WOODEN_RC_RC_FLAT_TO_RIGHT_BANK_FRONT_NE_SW, SPR_WOODEN_RC_RC_FLAT_TO_RIGHT_BANK_RAILS_FRONT_NE_SW },
         { SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_SE_NW, SPR_WOODEN_RC_FLAT_TO_RIGHT_BANK_RAILS_SE_NW, 0, 0 },
     };
 
@@ -1380,11 +1121,7 @@ static void wooden_rc_track_flat_to_right_bank(
 
 /** rct2: 0x008AC678 */
 static void wooden_rc_track_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_flat_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1392,22 +1129,14 @@ static void wooden_rc_track_left_bank_to_flat(
 
 /** rct2: 0x008AC688 */
 static void wooden_rc_track_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_flat_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void wooden_rc_track_banked_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const sprite_bb_2 imageIds[2][4][7] = {
@@ -1653,11 +1382,7 @@ static void wooden_rc_track_banked_right_quarter_turn_5(
 }
 
 static void wooden_rc_track_banked_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1666,23 +1391,15 @@ static void wooden_rc_track_banked_left_quarter_turn_5(
 
 /** rct2: 0x008AC6B8 */
 static void wooden_rc_track_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4] = {
         { SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_SW_NE, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_SW_NE, 0, 0 },
-        { SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_NW_SE,
-          SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_NW_SE,
-          SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_FRONT_NW_SE,
-          SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_FRONT_NW_SE },
-        { SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_NE_SW,
-          SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_NE_SW,
-          SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_FRONT_NE_SW,
-          SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_FRONT_NE_SW },
+        { SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_NW_SE, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_NW_SE,
+          SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_FRONT_NW_SE, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_FRONT_NW_SE },
+        { SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_NE_SW, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_NE_SW,
+          SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_FRONT_NE_SW, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_FRONT_NE_SW },
         { SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_SE_NW, SPR_WOODEN_RC_LEFT_BANK_TO_25_DEG_RAILS_SE_NW, 0, 0 },
     };
 
@@ -1709,23 +1426,15 @@ static void wooden_rc_track_left_bank_to_25_deg_up(
 
 /** rct2: 0x008AC6C8 */
 static void wooden_rc_track_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4] = {
         { SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_SW_NE, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_SW_NE, 0, 0 },
-        { SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_NW_SE,
-          SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_NW_SE,
-          SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_FRONT_NW_SE,
-          SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_FRONT_NW_SE },
-        { SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_NE_SW,
-          SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_NE_SW,
-          SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_FRONT_NE_SW,
-          SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_FRONT_NE_SW },
+        { SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_NW_SE, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_NW_SE,
+          SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_FRONT_NW_SE, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_FRONT_NW_SE },
+        { SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_NE_SW, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_NE_SW,
+          SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_FRONT_NE_SW, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_FRONT_NE_SW },
         { SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_SE_NW, SPR_WOODEN_RC_RIGHT_BANK_TO_25_DEG_RAILS_SE_NW, 0, 0 },
     };
 
@@ -1752,23 +1461,15 @@ static void wooden_rc_track_right_bank_to_25_deg_up(
 
 /** rct2: 0x008AC6D8 */
 static void wooden_rc_track_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4] = {
         { SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_SW_NE, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_SW_NE, 0, 0 },
-        { SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_NW_SE,
-          SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_NW_SE,
-          SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_FRONT_NW_SE,
-          SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_FRONT_NW_SE },
-        { SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_NE_SW,
-          SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_NE_SW,
-          SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_FRONT_NE_SW,
-          SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_FRONT_NE_SW },
+        { SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_NW_SE, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_NW_SE,
+          SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_FRONT_NW_SE, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_FRONT_NW_SE },
+        { SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_NE_SW, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_NE_SW,
+          SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_FRONT_NE_SW, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_FRONT_NE_SW },
         { SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_SE_NW, SPR_WOODEN_RC_25_DEG_TO_LEFT_BANK_RAILS_SE_NW, 0, 0 },
     };
 
@@ -1795,23 +1496,15 @@ static void wooden_rc_track_25_deg_up_to_left_bank(
 
 /** rct2: 0x008AC6E8 */
 static void wooden_rc_track_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4] = {
         { SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_SW_NE, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_SW_NE, 0, 0 },
-        { SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_NW_SE,
-          SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_NW_SE,
-          SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_FRONT_NW_SE,
-          SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_FRONT_NW_SE },
-        { SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_NE_SW,
-          SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_NE_SW,
-          SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_FRONT_NE_SW,
-          SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_FRONT_NE_SW },
+        { SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_NW_SE, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_NW_SE,
+          SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_FRONT_NW_SE, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_FRONT_NW_SE },
+        { SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_NE_SW, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_NE_SW,
+          SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_FRONT_NE_SW, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_FRONT_NE_SW },
         { SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_SE_NW, SPR_WOODEN_RC_25_DEG_TO_RIGHT_BANK_RAILS_SE_NW, 0, 0 },
     };
 
@@ -1838,11 +1531,7 @@ static void wooden_rc_track_25_deg_up_to_right_bank(
 
 /** rct2: 0x008AC6F8 */
 static void wooden_rc_track_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_25_deg_up_to_right_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1850,11 +1539,7 @@ static void wooden_rc_track_left_bank_to_25_deg_down(
 
 /** rct2: 0x008AC708 */
 static void wooden_rc_track_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_25_deg_up_to_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1862,11 +1547,7 @@ static void wooden_rc_track_right_bank_to_25_deg_down(
 
 /** rct2: 0x008AC718 */
 static void wooden_rc_track_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_right_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1874,11 +1555,7 @@ static void wooden_rc_track_25_deg_down_to_left_bank(
 
 /** rct2: 0x008AC728 */
 static void wooden_rc_track_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_left_bank_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1886,11 +1563,7 @@ static void wooden_rc_track_25_deg_down_to_right_bank(
 
 /** rct2: 0x008AC738 */
 static void wooden_rc_track_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -1910,11 +1583,7 @@ static void wooden_rc_track_left_bank(
 
 /** rct2: 0x008AC748 */
 static void wooden_rc_track_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_left_bank(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -1922,11 +1591,7 @@ static void wooden_rc_track_right_bank(
 
 /** rct2: 0x008AC758 */
 static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1947,30 +1612,10 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24652, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23812,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_track_colour(session) | 23812, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24678,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24678, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2017,114 +1662,34 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24653, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23813,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23813, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24679,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24679, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23792,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23792, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24658,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24658, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23797,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23797, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24663,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24663, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23819,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23819, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24685,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24685, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2133,8 +1698,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -2142,114 +1706,34 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23783,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23783, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24649,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24649, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23788,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23788, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24654,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24654, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23814,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23814, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24680,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24680, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 59);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23793,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23793, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24659,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24659, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2259,30 +1743,10 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24664, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23820,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23820, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24686,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24686, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 59);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2292,8 +1756,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 4:
@@ -2306,30 +1769,10 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23784,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23784, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24650,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24650, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2339,30 +1782,10 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24655, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23815,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23815, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24681,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24681, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2372,85 +1795,25 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24660, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23817,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23817, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24683,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24683, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23799,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23799, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24665,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24665, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23821,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23821, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24687,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24687, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2459,8 +1822,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -2479,30 +1841,10 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24656, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23816,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23816, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24682,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24682, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2512,30 +1854,10 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24661, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23818,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23818, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24684,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24684, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2545,30 +1867,10 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24666, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23822,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23822, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24688,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24688, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2590,11 +1892,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008AC768 */
 static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2622,30 +1920,10 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24637, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23807,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_track_colour(session) | 23807, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24673,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24673, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2674,85 +1952,25 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23762,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23762, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24628,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24628, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23801,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23801, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24667,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24667, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23767,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23767, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24633,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24633, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2762,30 +1980,10 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24638, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23808,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23808, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24674,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24674, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2801,8 +1999,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -2814,143 +2011,43 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24629, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23802,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23802, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24668,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24668, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 59);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23768,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23768, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24634,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24634, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23773,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23773, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24639,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24639, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23809,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23809, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24675,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24675, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 59);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23778,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23778, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24644,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24644, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -2960,8 +2057,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 4:
@@ -2974,56 +2070,16 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23764,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23764, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24630,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24630, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23803,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23803, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24669,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24669, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3033,30 +2089,10 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24635, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23805,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23805, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24671,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24671, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3066,59 +2102,19 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24640, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23810,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23810, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24676,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24676, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23779,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23779, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24645,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24645, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3127,8 +2123,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -3140,30 +2135,10 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24631, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23804,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23804, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24670,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24670, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3173,30 +2148,10 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24636, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23806,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23806, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24672,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24672, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3206,30 +2161,10 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24641, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23811,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23811, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24677,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24677, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3258,11 +2193,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008AC778 */
 static void wooden_rc_track_left_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -3271,11 +2202,7 @@ static void wooden_rc_track_left_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008AC788 */
 static void wooden_rc_track_right_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -3284,11 +2211,7 @@ static void wooden_rc_track_right_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008AC798 */
 static void wooden_rc_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3309,30 +2232,10 @@ static void wooden_rc_track_s_bend_left(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24595, 0, 0, 32, 25, 2, height, 0, 3, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23741,
-                        0,
-                        0,
-                        32,
-                        25,
-                        0,
-                        height,
-                        0,
-                        3,
+                        session, direction, wooden_rc_get_track_colour(session) | 23741, 0, 0, 32, 25, 0, height, 0, 3,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24607,
-                        0,
-                        0,
-                        32,
-                        25,
-                        0,
-                        height,
-                        0,
-                        3,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24607, 0, 0, 32, 25, 0, height, 0, 3,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3349,30 +2252,10 @@ static void wooden_rc_track_s_bend_left(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24598, 0, 0, 32, 25, 2, height, 0, 3, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23744,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_track_colour(session) | 23744, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24610,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24610, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3400,30 +2283,10 @@ static void wooden_rc_track_s_bend_left(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24596, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23742,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23742, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24608,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24608, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3440,30 +2303,10 @@ static void wooden_rc_track_s_bend_left(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24597, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23743,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23743, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24609,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24609, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3472,8 +2315,7 @@ static void wooden_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -3492,30 +2334,10 @@ static void wooden_rc_track_s_bend_left(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24597, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23743,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23743, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24609,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24609, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3532,30 +2354,10 @@ static void wooden_rc_track_s_bend_left(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24596, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23742,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23742, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24608,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24608, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3564,8 +2366,7 @@ static void wooden_rc_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -3584,30 +2385,10 @@ static void wooden_rc_track_s_bend_left(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24598, 0, 0, 32, 25, 2, height, 0, 3, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23744,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_track_colour(session) | 23744, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24610,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24610, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3624,30 +2405,10 @@ static void wooden_rc_track_s_bend_left(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24595, 0, 0, 32, 25, 2, height, 0, 3, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23741,
-                        0,
-                        0,
-                        32,
-                        25,
-                        0,
-                        height,
-                        0,
-                        3,
+                        session, direction, wooden_rc_get_track_colour(session) | 23741, 0, 0, 32, 25, 0, height, 0, 3,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24607,
-                        0,
-                        0,
-                        32,
-                        25,
-                        0,
-                        height,
-                        0,
-                        3,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24607, 0, 0, 32, 25, 0, height, 0, 3,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3669,11 +2430,7 @@ static void wooden_rc_track_s_bend_left(
 
 /** rct2: 0x008AC7A8 */
 static void wooden_rc_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3687,30 +2444,10 @@ static void wooden_rc_track_s_bend_right(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24599, 0, 0, 32, 25, 2, height, 0, 3, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23745,
-                        0,
-                        0,
-                        32,
-                        25,
-                        0,
-                        height,
-                        0,
-                        3,
+                        session, direction, wooden_rc_get_track_colour(session) | 23745, 0, 0, 32, 25, 0, height, 0, 3,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24611,
-                        0,
-                        0,
-                        32,
-                        25,
-                        0,
-                        height,
-                        0,
-                        3,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24611, 0, 0, 32, 25, 0, height, 0, 3,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3727,30 +2464,10 @@ static void wooden_rc_track_s_bend_right(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24602, 0, 0, 32, 25, 2, height, 0, 3, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23748,
-                        0,
-                        0,
-                        32,
-                        25,
-                        0,
-                        height,
-                        0,
-                        3,
+                        session, direction, wooden_rc_get_track_colour(session) | 23748, 0, 0, 32, 25, 0, height, 0, 3,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24614,
-                        0,
-                        0,
-                        32,
-                        25,
-                        0,
-                        height,
-                        0,
-                        3,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24614, 0, 0, 32, 25, 0, height, 0, 3,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3778,30 +2495,10 @@ static void wooden_rc_track_s_bend_right(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24600, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23746,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23746, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24612,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24612, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3818,30 +2515,10 @@ static void wooden_rc_track_s_bend_right(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24601, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23747,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23747, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24613,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24613, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3857,8 +2534,7 @@ static void wooden_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 2:
@@ -3870,30 +2546,10 @@ static void wooden_rc_track_s_bend_right(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24601, 0, 0, 32, 26, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23747,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23747, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24613,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24613, 0, 0, 32, 26, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3910,30 +2566,10 @@ static void wooden_rc_track_s_bend_right(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24600, 0, 0, 32, 26, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23746,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23746, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24612,
-                        0,
-                        0,
-                        32,
-                        26,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24612, 0, 0, 32, 26, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -3949,8 +2585,7 @@ static void wooden_rc_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -3962,30 +2597,10 @@ static void wooden_rc_track_s_bend_right(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24602, 0, 0, 32, 25, 2, height, 0, 3, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23748,
-                        0,
-                        0,
-                        32,
-                        25,
-                        0,
-                        height,
-                        0,
-                        3,
+                        session, direction, wooden_rc_get_track_colour(session) | 23748, 0, 0, 32, 25, 0, height, 0, 3,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24614,
-                        0,
-                        0,
-                        32,
-                        25,
-                        0,
-                        height,
-                        0,
-                        3,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24614, 0, 0, 32, 25, 0, height, 0, 3,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4002,30 +2617,10 @@ static void wooden_rc_track_s_bend_right(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24599, 0, 0, 32, 25, 2, height, 0, 3, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23745,
-                        0,
-                        0,
-                        32,
-                        25,
-                        0,
-                        height,
-                        0,
-                        3,
+                        session, direction, wooden_rc_get_track_colour(session) | 23745, 0, 0, 32, 25, 0, height, 0, 3,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24611,
-                        0,
-                        0,
-                        32,
-                        25,
-                        0,
-                        height,
-                        0,
-                        3,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24611, 0, 0, 32, 25, 0, height, 0, 3,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4054,11 +2649,7 @@ static void wooden_rc_track_s_bend_right(
 
 /** rct2: 0x008ACE18 */
 static void wooden_rc_track_left_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4092,8 +2683,7 @@ static void wooden_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 56, 0x20);
             break;
         case 1:
@@ -4128,8 +2718,7 @@ static void wooden_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 2:
@@ -4180,8 +2769,7 @@ static void wooden_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 4:
@@ -4214,8 +2802,7 @@ static void wooden_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 7:
@@ -4274,8 +2861,7 @@ static void wooden_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 9:
@@ -4312,8 +2898,7 @@ static void wooden_rc_track_left_vertical_loop(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 56, 0x20);
             break;
     }
@@ -4321,11 +2906,7 @@ static void wooden_rc_track_left_vertical_loop(
 
 /** rct2: 0x008ACE28 */
 static void wooden_rc_track_right_vertical_loop(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4550,11 +3131,7 @@ static void wooden_rc_track_right_vertical_loop(
 
 /** rct2: 0x008AC7E8 */
 static void wooden_rc_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4575,30 +3152,10 @@ static void wooden_rc_track_left_quarter_turn_3(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24697, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23840,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23840, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24706,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24706, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4615,30 +3172,10 @@ static void wooden_rc_track_left_quarter_turn_3(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24691, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23837,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23837, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24703,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24703, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4658,30 +3195,10 @@ static void wooden_rc_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23827,
-                        16,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23827, 16, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24693,
-                        16,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24693, 16, 0, 16, 16, 2, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -4690,112 +3207,32 @@ static void wooden_rc_track_left_quarter_turn_3(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24696, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23839,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23839, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24705,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24705, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23833,
-                        0,
-                        16,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23833, 0, 16, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24699,
-                        0,
-                        16,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24699, 0, 16, 16, 16, 2, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23824,
-                        16,
-                        16,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23824, 16, 16, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24690,
-                        16,
-                        16,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24690, 16, 16, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23836,
-                        16,
-                        16,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23836, 16, 16, 16, 16, 0, height, 16, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24702,
-                        16,
-                        16,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24702, 16, 16, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
             }
@@ -4819,30 +3256,10 @@ static void wooden_rc_track_left_quarter_turn_3(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24695, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23838,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23838, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24704,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24704, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4859,30 +3276,10 @@ static void wooden_rc_track_left_quarter_turn_3(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24689, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23835,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23835, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24701,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24701, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4904,11 +3301,7 @@ static void wooden_rc_track_left_quarter_turn_3(
 
 /** rct2: 0x008AC7F8 */
 static void wooden_rc_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -4917,11 +3310,7 @@ static void wooden_rc_track_right_quarter_turn_3(
 
 /** rct2: 0x008AC808 */
 static void wooden_rc_track_left_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -4942,30 +3331,10 @@ static void wooden_rc_track_left_quarter_turn_3_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24715, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23858,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23858, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24724,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24724, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -4982,30 +3351,10 @@ static void wooden_rc_track_left_quarter_turn_3_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24709, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23855,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23855, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24721,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24721, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5025,30 +3374,10 @@ static void wooden_rc_track_left_quarter_turn_3_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23845,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23845, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24711,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24711, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -5057,112 +3386,32 @@ static void wooden_rc_track_left_quarter_turn_3_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24714, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23857,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23857, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24723,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24723, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23851,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23851, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24717,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24717, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23842,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23842, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24708,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24708, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23854,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23854, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24720,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24720, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
             }
@@ -5186,30 +3435,10 @@ static void wooden_rc_track_left_quarter_turn_3_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24713, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23856,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23856, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24722,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24722, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5226,30 +3455,10 @@ static void wooden_rc_track_left_quarter_turn_3_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24707, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23853,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23853, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24719,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24719, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5271,11 +3480,7 @@ static void wooden_rc_track_left_quarter_turn_3_bank(
 
 /** rct2: 0x008AC818 */
 static void wooden_rc_track_right_quarter_turn_3_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -5284,11 +3489,7 @@ static void wooden_rc_track_right_quarter_turn_3_bank(
 
 /** rct2: 0x008AC828 */
 static void wooden_rc_track_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5309,30 +3510,10 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24774, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23919,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23919, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24785,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24785, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5349,30 +3530,10 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24770, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23917,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23917, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24783,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24783, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5408,30 +3569,10 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24773, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23918,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23918, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24784,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24784, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5441,30 +3582,10 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24775, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23920,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23920, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24786,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24786, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5474,30 +3595,10 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24769, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23916,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23916, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24782,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24782, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5519,11 +3620,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008AC838 */
 static void wooden_rc_track_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5537,30 +3634,10 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24761, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23911,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23911, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24777,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24777, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5577,30 +3654,10 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24765, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23914,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23914, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24780,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24780, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5636,30 +3693,10 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24762, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23912,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23912, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24778,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24778, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5669,30 +3706,10 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24764, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23913,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23913, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24779,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24779, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5702,30 +3719,10 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24766, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23915,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23915, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24781,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24781, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5754,11 +3751,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008AC848 */
 static void wooden_rc_track_left_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -5767,11 +3760,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008AC858 */
 static void wooden_rc_track_right_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -5780,11 +3769,7 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008ACAB8 */
 static void wooden_rc_track_left_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -5805,30 +3790,10 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24751, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23894,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23894, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24760,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24760, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5845,30 +3810,10 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24745, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23891,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23891, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24757,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24757, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -5880,10 +3825,8 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -5909,30 +3852,10 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23881,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23881, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24747,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24747, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -5941,112 +3864,32 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24750, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23893,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23893, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24759,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24759, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23887,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23887, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24753,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24753, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23878,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23878, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24744,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24744, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23890,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23890, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24756,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24756, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
             }
@@ -6070,30 +3913,10 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24749, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23892,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23892, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24758,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24758, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6110,30 +3933,10 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24743, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23889,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23889, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24755,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24755, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6150,10 +3953,8 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -6165,30 +3966,10 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24745, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23891,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23891, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24757,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24757, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6205,30 +3986,10 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24751, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23894,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23894, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24760,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24760, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6252,10 +4013,8 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -6281,84 +4040,24 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23878,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23878, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24744,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24744, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23890,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23890, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24756,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24756, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23881,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23881, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24747,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24747, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -6367,58 +4066,18 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24750, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23893,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23893, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24759,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24759, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23887,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23887, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24753,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24753, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     break;
             }
@@ -6435,30 +4094,10 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24743, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23889,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23889, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24755,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24755, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6475,30 +4114,10 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24749, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23892,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23892, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24758,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24758, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6517,10 +4136,8 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -6528,11 +4145,7 @@ static void wooden_rc_track_left_half_banked_helix_up_small(
 
 /** rct2: 0x008ACAC8 */
 static void wooden_rc_track_right_half_banked_helix_up_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -6546,30 +4159,10 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24725, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23871,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23871, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24737,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24737, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6586,30 +4179,10 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24731, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23874,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23874, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24740,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24740, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6628,10 +4201,8 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -6657,84 +4228,24 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23860,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23860, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24726,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24726, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23872,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23872, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24738,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24738, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23863,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23863, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24729,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24729, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     break;
                 case 2:
@@ -6743,58 +4254,18 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24732, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23875,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23875, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24741,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24741, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23869,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23869, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24735,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24735, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     break;
             }
@@ -6811,30 +4282,10 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24727, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23873,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23873, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24739,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24739, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6851,30 +4302,10 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24733, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23876,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23876, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24742,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24742, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6898,10 +4329,8 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 4:
@@ -6920,30 +4349,10 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24731, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23874,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23874, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24740,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24740, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -6960,30 +4369,10 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24725, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23871,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23871, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24737,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24737, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7000,10 +4389,8 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 5:
@@ -7029,30 +4416,10 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23863,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23863, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24729,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24729, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     break;
                 case 1:
@@ -7061,112 +4428,32 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24732, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23875,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23875, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24741,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24741, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23869,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23869, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24735,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24735, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23860,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23860, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24726,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24726, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23872,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23872, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24738,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24738, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     break;
             }
@@ -7190,30 +4477,10 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24733, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23876,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23876, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24742,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24742, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7230,30 +4497,10 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24727, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23873,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23873, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24739,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24739, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7265,10 +4512,8 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -7276,11 +4521,7 @@ static void wooden_rc_track_right_half_banked_helix_up_small(
 
 /** rct2: 0x008ACAD8 */
 static void wooden_rc_track_left_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -7295,11 +4536,7 @@ static void wooden_rc_track_left_half_banked_helix_down_small(
 
 /** rct2: 0x008ACAE8 */
 static void wooden_rc_track_right_half_banked_helix_down_small(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 4)
@@ -7314,11 +4551,7 @@ static void wooden_rc_track_right_half_banked_helix_down_small(
 
 /** rct2: 0x008ACAF8 */
 static void wooden_rc_track_left_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -7339,30 +4572,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24575, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23724,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_track_colour(session) | 23724, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24590,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24590, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7379,30 +4592,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24565, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23719,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23719, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24585,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24585, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7414,10 +4607,8 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -7441,114 +4632,34 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24574, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23723,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23723, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24589,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24589, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23713,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23713, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24579,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24579, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23698,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23698, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24564,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24564, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23718,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23718, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24584,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24584, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7557,8 +4668,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -7566,114 +4676,34 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23702,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23702, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24568,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24568, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23707,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23707, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24573,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24573, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23722,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23722, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 29);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24588,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24588, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 29);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23712,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23712, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24578,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24578, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7683,30 +4713,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24563, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23717,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23717, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24583,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24583, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7727,30 +4737,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23701,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23701, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24567,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24567, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7760,30 +4750,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24572, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23721,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23721, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 33);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24587,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24587, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 33);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7796,56 +4766,16 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23696,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23696, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24562,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24562, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23716,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23716, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24582,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24582, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7854,8 +4784,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -7874,30 +4803,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24571, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23720,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23720, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 33);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24586,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24586, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 33);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7914,30 +4823,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24561, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23715,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23715, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24581,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24581, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -7954,10 +4843,8 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -7969,30 +4856,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24565, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23719,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23719, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24585,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24585, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8009,30 +4876,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24575, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23724,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23724, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24590,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24590, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8056,10 +4903,8 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -8072,56 +4917,16 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23698,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23698, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24564,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24564, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23718,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23718, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24584,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24584, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8138,59 +4943,19 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24574, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23723,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23723, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24589,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24589, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23713,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23713, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24579,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24579, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8199,8 +4964,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -8212,143 +4976,43 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24563, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23717,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23717, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24583,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24583, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23702,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23702, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24568,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24568, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23707,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23707, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24573,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24573, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23722,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23722, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 29);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24588,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24588, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 29);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23712,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23712, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24578,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24578, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8369,85 +5033,25 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23696,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23696, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24562,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24562, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23716,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23716, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24582,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24582, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23701,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23701, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24567,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24567, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8457,30 +5061,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24572, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23721,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23721, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 33);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24587,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24587, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 33);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8496,8 +5080,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -8509,30 +5092,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24561, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23715,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23715, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24581,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24581, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8549,30 +5112,10 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24571, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23720,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_track_colour(session) | 23720, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 33);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24586,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24586, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 33);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8591,10 +5134,8 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -8602,11 +5143,7 @@ static void wooden_rc_track_left_half_banked_helix_up_large(
 
 /** rct2: 0x008ACB08 */
 static void wooden_rc_track_right_half_banked_helix_up_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -8620,30 +5157,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24531, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23685,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23685, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24551,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24551, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8660,30 +5177,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24541, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23690,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_track_colour(session) | 23690, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24556,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24556, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8702,10 +5199,8 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 1:
@@ -8718,85 +5213,25 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23666,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23666, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24532,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24532, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23686,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23686, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24552,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24552, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23671,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23671, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24537,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24537, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8806,30 +5241,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24542, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23691,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23691, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24557,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24557, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -8845,8 +5260,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 3:
@@ -8858,143 +5272,43 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24533, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23687,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23687, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24553,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24553, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23672,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23672, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24538,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24538, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23677,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23677, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24543,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24543, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23692,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23692, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 29);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24558,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24558, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 29);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23682,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23682, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24548,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24548, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9015,56 +5329,16 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23668,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23668, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24534,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24534, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23688,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23688, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24554,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24554, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9081,59 +5355,19 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24544, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23693,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23693, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 33);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24559,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24559, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 33);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23683,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23683, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24549,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24549, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9142,8 +5376,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 6:
@@ -9155,30 +5388,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24535, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23689,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23689, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24555,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24555, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9195,30 +5408,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24545, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23694,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23694, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 33);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24560,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24560, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 33);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9242,10 +5435,8 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 7:
@@ -9264,30 +5455,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24541, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23690,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23690, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24556,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24556, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9304,30 +5475,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24531, 0, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23685,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23685, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24551,
-                        0,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24551, 0, 0, 20, 32, 0, height, 6, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9344,10 +5495,8 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_CC, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 8:
@@ -9360,30 +5509,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23671,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23671, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24537,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24537, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9393,30 +5522,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24542, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23691,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23691, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24557,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24557, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9429,56 +5538,16 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23666,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23666, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24532,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24532, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23686,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23686, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24552,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24552, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9487,8 +5556,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 10:
@@ -9496,114 +5564,34 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23672,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23672, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24538,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24538, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23677,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23677, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24543,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24543, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23692,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23692, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 29);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24558,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24558, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 29);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23682,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23682, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24548,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24548, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9613,30 +5601,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24533, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23687,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23687, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24553,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24553, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9668,114 +5636,34 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24544, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23693,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23693, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 33);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24559,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24559, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 33);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23683,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23683, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24549,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24549, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23668,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23668, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24534,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24534, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23688,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 23688, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24554,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24554, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9784,8 +5672,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
         case 13:
@@ -9804,30 +5691,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24545, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23694,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_track_colour(session) | 23694, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 33);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24560,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24560, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 33);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9844,30 +5711,10 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24535, 0, 0, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23689,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23689, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24555,
-                        0,
-                        0,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24555, 0, 0, 32, 20, 0, height, 0, 6,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -9879,10 +5726,8 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
             paint_util_set_segment_support_height(
                 session, paint_util_rotate_segments(SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_D4, direction), 48, 0x20);
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 32, 0x20);
             break;
     }
@@ -9890,11 +5735,7 @@ static void wooden_rc_track_right_half_banked_helix_up_large(
 
 /** rct2: 0x008ACB18 */
 static void wooden_rc_track_left_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -9909,11 +5750,7 @@ static void wooden_rc_track_left_half_banked_helix_down_large(
 
 /** rct2: 0x008ACB28 */
 static void wooden_rc_track_right_half_banked_helix_down_large(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence >= 7)
@@ -9928,11 +5765,7 @@ static void wooden_rc_track_right_half_banked_helix_down_large(
 
 /** rct2: 0x008ACB98 */
 static void wooden_rc_track_left_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -9985,11 +5818,7 @@ static void wooden_rc_track_left_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008ACB78 */
 static void wooden_rc_track_right_quarter_turn_1_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -10042,11 +5871,7 @@ static void wooden_rc_track_right_quarter_turn_1_60_deg_up(
 
 /** rct2: 0x008ACB88 */
 static void wooden_rc_track_left_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_right_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction + 1) & 3, height, tileElement);
@@ -10054,11 +5879,7 @@ static void wooden_rc_track_left_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008ACBA8 */
 static void wooden_rc_track_right_quarter_turn_1_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_left_quarter_turn_1_60_deg_up(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement);
@@ -10066,11 +5887,7 @@ static void wooden_rc_track_right_quarter_turn_1_60_deg_down(
 
 /** rct2: 0x008AC868 */
 static void wooden_rc_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -10090,11 +5907,7 @@ static void wooden_rc_track_brakes(
 
 /** rct2: 0x008ACC78 */
 static void wooden_rc_track_25_deg_up_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -10150,11 +5963,7 @@ static void wooden_rc_track_25_deg_up_left_banked(
 
 /** rct2: 0x008ACC88 */
 static void wooden_rc_track_25_deg_up_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -10210,11 +6019,7 @@ static void wooden_rc_track_25_deg_up_right_banked(
 
 /** rct2: 0x008AC878 */
 static void wooden_rc_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -10253,11 +6058,7 @@ static void wooden_rc_track_on_ride_photo(
 
 /** rct2: 0x008ACC98 */
 static void wooden_rc_track_25_deg_down_left_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_25_deg_up_right_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -10265,11 +6066,7 @@ static void wooden_rc_track_25_deg_down_left_banked(
 
 /** rct2: 0x008ACCA8 */
 static void wooden_rc_track_25_deg_down_right_banked(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_25_deg_up_left_banked(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -10277,11 +6074,7 @@ static void wooden_rc_track_25_deg_down_right_banked(
 
 /** rct2: 0x008ACE08 */
 static void wooden_rc_track_water_splash(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -10297,30 +6090,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23997,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23997, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24863,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24863, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23993, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10335,30 +6108,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23998,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23998, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24864,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24864, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23994, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10373,30 +6126,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23995,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23995, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24861,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24861, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23991, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10411,30 +6144,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23996,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23996, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24862,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24862, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23992, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10458,30 +6171,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23985,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23985, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24851,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24851, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23981, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10496,30 +6189,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23986,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23986, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24852,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24852, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23982, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10534,30 +6207,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23983,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23983, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24849,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24849, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23979, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10572,30 +6225,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23984,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23984, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24850,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24850, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23980, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10619,30 +6252,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24003,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24003, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24869,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24869, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 24001, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10658,30 +6271,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24004,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24004, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24870,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24870, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 24002, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10704,30 +6297,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23983,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23983, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24849,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24849, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23979, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10742,30 +6315,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23984,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23984, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24850,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24850, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23980, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10780,30 +6333,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23985,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23985, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24851,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24851, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23981, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10818,30 +6351,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23986,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23986, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24852,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24852, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23982, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10864,30 +6377,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23995,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23995, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24861,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24861, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23991, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10902,30 +6395,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23996,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23996, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24862,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24862, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23992, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10940,30 +6413,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23997,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23997, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24863,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24863, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23993, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -10978,30 +6431,10 @@ static void wooden_rc_track_water_splash(
                     sub_98199C_rotated(session, direction, 0x61000000 | 5048, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(session, direction, 0x00000000 | 5053, 0, 0, 32, 25, 2, height + 16, 0, 3, height + 16);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 23998,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 23998, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_SUPPORTS] | 24864,
-                        0,
-                        0,
-                        32,
-                        25,
-                        2,
-                        height,
-                        0,
-                        3,
+                        session, direction, session->TrackColours[SCHEME_SUPPORTS] | 24864, 0, 0, 32, 25, 2, height, 0, 3,
                         height);
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_track_colour(session) | 23994, 0, 0, 32, 25, 2, height, 0, 3, height);
@@ -11019,11 +6452,7 @@ static void wooden_rc_track_water_splash(
 
 /** rct2: 0x008AC958 */
 static void wooden_rc_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11044,30 +6473,10 @@ static void wooden_rc_track_left_eighth_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25007, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24153,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24153, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25019,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25019, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -11084,30 +6493,10 @@ static void wooden_rc_track_left_eighth_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25015, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24157,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24157, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25023,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25023, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -11135,114 +6524,34 @@ static void wooden_rc_track_left_eighth_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25008, 0, 0, 34, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24154,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24154, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25020,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25020, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24146,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24146, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25012,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25012, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24150,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24150, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25016,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25016, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24158,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24158, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25024,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25024, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -11255,114 +6564,34 @@ static void wooden_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24139,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24139, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25005,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25005, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24143,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24143, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25009,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25009, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24155,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24155, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25021,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25021, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24147,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24147, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25013,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25013, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -11372,30 +6601,10 @@ static void wooden_rc_track_left_eighth_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25017, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24159,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24159, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25025,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25025, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -11427,84 +6636,24 @@ static void wooden_rc_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24140,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24140, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25006,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25006, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24144,
-                        0,
-                        0,
-                        16,
-                        18,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24144, 0, 0, 16, 18, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25010,
-                        0,
-                        0,
-                        16,
-                        18,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25010, 0, 0, 16, 18, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24156,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24156, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25022,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25022, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 2:
@@ -11515,56 +6664,16 @@ static void wooden_rc_track_left_eighth_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24152,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24152, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25018,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25018, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24160,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24160, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25026,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25026, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
             }
@@ -11576,11 +6685,7 @@ static void wooden_rc_track_left_eighth_to_diag(
 
 /** rct2: 0x008AC968 */
 static void wooden_rc_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -11594,30 +6699,10 @@ static void wooden_rc_track_right_eighth_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24979, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24129,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24129, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24995,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24995, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -11634,30 +6719,10 @@ static void wooden_rc_track_right_eighth_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24987, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24133,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24133, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24999,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24999, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -11681,85 +6746,25 @@ static void wooden_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24114,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24114, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24980,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24980, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24130,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24130, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24996,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24996, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24118,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24118, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24984,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24984, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -11769,30 +6774,10 @@ static void wooden_rc_track_right_eighth_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24988, 0, 0, 34, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24134,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24134, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25000,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25000, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -11816,59 +6801,19 @@ static void wooden_rc_track_right_eighth_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24981, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24131,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24131, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24997,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24997, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24119,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24119, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24985,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24985, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -11878,59 +6823,19 @@ static void wooden_rc_track_right_eighth_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24989, 0, 0, 28, 28, 2, height, 4, 4, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24135,
-                        0,
-                        0,
-                        28,
-                        28,
-                        0,
-                        height,
-                        4,
-                        4,
+                        session, direction, wooden_rc_get_track_colour(session) | 24135, 0, 0, 28, 28, 0, height, 4, 4,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25001,
-                        0,
-                        0,
-                        28,
-                        28,
-                        0,
-                        height,
-                        4,
-                        4,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25001, 0, 0, 28, 28, 0, height, 4, 4,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24127,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24127, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24993,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24993, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -11962,56 +6867,16 @@ static void wooden_rc_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24116,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24116, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24982,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24982, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24132,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24132, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24998,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24998, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 1:
@@ -12022,84 +6887,24 @@ static void wooden_rc_track_right_eighth_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24124,
-                        0,
-                        0,
-                        16,
-                        18,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24124, 0, 0, 16, 18, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24990,
-                        0,
-                        0,
-                        16,
-                        18,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24990, 0, 0, 16, 18, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24136,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24136, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25002,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25002, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24128,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24128, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24994,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24994, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     break;
             }
@@ -12111,11 +6916,7 @@ static void wooden_rc_track_right_eighth_to_diag(
 
 /** rct2: 0x008AC978 */
 static void wooden_rc_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -12124,11 +6925,7 @@ static void wooden_rc_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008AC988 */
 static void wooden_rc_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -12137,11 +6934,7 @@ static void wooden_rc_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008AC998 */
 static void wooden_rc_track_left_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12162,30 +6955,10 @@ static void wooden_rc_track_left_eighth_bank_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25055, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24201,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24201, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25067,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25067, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -12202,30 +6975,10 @@ static void wooden_rc_track_left_eighth_bank_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25063, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24205,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24205, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25071,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25071, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -12253,114 +7006,34 @@ static void wooden_rc_track_left_eighth_bank_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25056, 0, 0, 34, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24202,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24202, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25068,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25068, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24194,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24194, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25060,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25060, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24198,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24198, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25064,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25064, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24206,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24206, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25072,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25072, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -12373,114 +7046,34 @@ static void wooden_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24187,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24187, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25053,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25053, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24191,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24191, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25057,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25057, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24203,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24203, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25069,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25069, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24195,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24195, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25061,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25061, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -12490,30 +7083,10 @@ static void wooden_rc_track_left_eighth_bank_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25065, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24207,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24207, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25073,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25073, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -12545,84 +7118,24 @@ static void wooden_rc_track_left_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24188,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24188, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25054,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25054, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24192,
-                        0,
-                        0,
-                        16,
-                        18,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24192, 0, 0, 16, 18, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25058,
-                        0,
-                        0,
-                        16,
-                        18,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25058, 0, 0, 16, 18, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24204,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24204, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25070,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25070, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 2:
@@ -12633,56 +7146,16 @@ static void wooden_rc_track_left_eighth_bank_to_diag(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24200,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24200, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25066,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25066, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24208,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24208, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25074,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25074, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
             }
@@ -12694,11 +7167,7 @@ static void wooden_rc_track_left_eighth_bank_to_diag(
 
 /** rct2: 0x008AC9A8 */
 static void wooden_rc_track_right_eighth_bank_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -12712,30 +7181,10 @@ static void wooden_rc_track_right_eighth_bank_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25027, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24177,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24177, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25043,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25043, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -12752,30 +7201,10 @@ static void wooden_rc_track_right_eighth_bank_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25035, 0, 0, 32, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24181,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24181, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25047,
-                        0,
-                        0,
-                        32,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25047, 0, 0, 32, 32, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -12799,85 +7228,25 @@ static void wooden_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24162,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24162, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25028,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25028, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24178,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24178, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25044,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25044, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24166,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24166, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25032,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25032, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -12887,30 +7256,10 @@ static void wooden_rc_track_right_eighth_bank_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25036, 0, 0, 34, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24182,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24182, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25048,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25048, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 0, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -12934,59 +7283,19 @@ static void wooden_rc_track_right_eighth_bank_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25029, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24179,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24179, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25045,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25045, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24167,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24167, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25033,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25033, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -12996,59 +7305,19 @@ static void wooden_rc_track_right_eighth_bank_to_diag(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25037, 0, 0, 28, 28, 2, height, 4, 4, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24183,
-                        0,
-                        0,
-                        28,
-                        28,
-                        0,
-                        height,
-                        4,
-                        4,
+                        session, direction, wooden_rc_get_track_colour(session) | 24183, 0, 0, 28, 28, 0, height, 4, 4,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25049,
-                        0,
-                        0,
-                        28,
-                        28,
-                        0,
-                        height,
-                        4,
-                        4,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25049, 0, 0, 28, 28, 0, height, 4, 4,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24175,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24175, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25041,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25041, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -13080,56 +7349,16 @@ static void wooden_rc_track_right_eighth_bank_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24164,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24164, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25030,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25030, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24180,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24180, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25046,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25046, 0, 0, 16, 16, 0, height, 16, 0,
                         height + 27);
                     break;
                 case 1:
@@ -13140,84 +7369,24 @@ static void wooden_rc_track_right_eighth_bank_to_diag(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24172,
-                        0,
-                        0,
-                        16,
-                        18,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24172, 0, 0, 16, 18, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25038,
-                        0,
-                        0,
-                        16,
-                        18,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25038, 0, 0, 16, 18, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24184,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24184, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25050,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25050, 0, 0, 16, 16, 0, height, 0, 16,
                         height + 27);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24176,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24176, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25042,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25042, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     break;
             }
@@ -13229,11 +7398,7 @@ static void wooden_rc_track_right_eighth_bank_to_diag(
 
 /** rct2: 0x008AC9B8 */
 static void wooden_rc_track_left_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -13242,11 +7407,7 @@ static void wooden_rc_track_left_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008AC9C8 */
 static void wooden_rc_track_right_eighth_bank_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -13255,11 +7416,7 @@ static void wooden_rc_track_right_eighth_bank_to_orthogonal(
 
 /** rct2: 0x008AC888 */
 static void wooden_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13271,31 +7428,11 @@ static void wooden_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24050,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24050, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24916,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24916, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -13305,31 +7442,11 @@ static void wooden_rc_track_diag_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24008,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24008, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24874,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24874, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -13343,57 +7460,17 @@ static void wooden_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24047,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24047, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24913,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24913, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24051,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, wooden_rc_get_track_colour(session) | 24051, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24917,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24917, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -13413,57 +7490,17 @@ static void wooden_rc_track_diag_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24005,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24005, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24871,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24871, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24009,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, wooden_rc_get_track_colour(session) | 24009, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24875,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24875, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -13493,57 +7530,17 @@ static void wooden_rc_track_diag_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24049,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24049, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24915,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24915, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24052,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, wooden_rc_get_track_colour(session) | 24052, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24918,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24918, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -13563,57 +7560,17 @@ static void wooden_rc_track_diag_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24007,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24007, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24873,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24873, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24010,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, wooden_rc_get_track_colour(session) | 24010, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24876,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 27);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24876, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 27);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -13631,31 +7588,11 @@ static void wooden_rc_track_diag_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24048,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24048, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24914,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24914, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -13665,31 +7602,11 @@ static void wooden_rc_track_diag_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24006,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24006, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24872,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24872, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -13701,11 +7618,7 @@ static void wooden_rc_track_diag_flat(
 
 /** rct2: 0x008AC8B8 */
 static void wooden_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -13717,31 +7630,11 @@ static void wooden_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24068,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24068, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24934,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24934, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -13751,31 +7644,11 @@ static void wooden_rc_track_diag_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24026,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24026, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24892,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24892, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -13789,57 +7662,17 @@ static void wooden_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24065,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24065, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24931,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24931, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24069,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_track_colour(session) | 24069, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24935,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24935, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -13863,57 +7696,17 @@ static void wooden_rc_track_diag_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24023,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24023, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24889,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24889, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24027,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_track_colour(session) | 24027, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24893,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24893, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -13949,57 +7742,17 @@ static void wooden_rc_track_diag_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24067,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24067, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24933,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24933, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24070,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_track_colour(session) | 24070, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24936,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24936, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -14023,57 +7776,17 @@ static void wooden_rc_track_diag_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24025,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24025, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24891,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24891, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24028,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_track_colour(session) | 24028, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24894,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24894, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -14093,31 +7806,11 @@ static void wooden_rc_track_diag_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24066,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24066, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24932,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24932, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -14127,31 +7820,11 @@ static void wooden_rc_track_diag_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24024,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24024, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24890,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24890, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -14163,11 +7836,7 @@ static void wooden_rc_track_diag_25_deg_up(
 
 /** rct2: 0x008AC8E8 */
 static void wooden_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14177,30 +7846,10 @@ static void wooden_rc_track_diag_60_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24044,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24044, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24910,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24910, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -14212,56 +7861,16 @@ static void wooden_rc_track_diag_60_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24041,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24041, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24907,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24907, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24045,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24045, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 91);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24911,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24911, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 91);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -14289,56 +7898,16 @@ static void wooden_rc_track_diag_60_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24043,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24043, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24909,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24909, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24046,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24046, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 91);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24912,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24912, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 91);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -14354,30 +7923,10 @@ static void wooden_rc_track_diag_60_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24042,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24042, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24908,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24908, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -14389,11 +7938,7 @@ static void wooden_rc_track_diag_60_deg_up(
 
 /** rct2: 0x008AC898 */
 static void wooden_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14405,31 +7950,11 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24056,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24056, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24922,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24922, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -14439,31 +7964,11 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24014,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24014, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24880,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24880, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -14477,57 +7982,17 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24053,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24053, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24919,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24919, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24057,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24057, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24923,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24923, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -14547,57 +8012,17 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24011,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24011, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24877,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24877, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24015,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24015, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24881,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24881, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -14627,57 +8052,17 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24055,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24055, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24921,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24921, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24058,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24058, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24924,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24924, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -14697,57 +8082,17 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24013,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24013, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24879,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24879, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24016,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24016, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24882,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24882, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -14765,31 +8110,11 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24054,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24054, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24920,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24920, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -14799,31 +8124,11 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24012,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24012, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24878,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24878, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -14835,11 +8140,7 @@ static void wooden_rc_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008AC8C8 */
 static void wooden_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -14849,30 +8150,10 @@ static void wooden_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24032,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24032, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24898,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24898, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -14884,56 +8165,16 @@ static void wooden_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24029,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24029, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24895,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24895, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24033,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24033, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24899,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24899, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -14961,56 +8202,16 @@ static void wooden_rc_track_diag_25_deg_up_to_60_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24031,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24031, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24897,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24897, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24034,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24034, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24900,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24900, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -15026,30 +8227,10 @@ static void wooden_rc_track_diag_25_deg_up_to_60_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24030,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24030, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24896,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24896, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -15061,11 +8242,7 @@ static void wooden_rc_track_diag_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x008AC8D8 */
 static void wooden_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -15075,30 +8252,10 @@ static void wooden_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24038,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24038, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24904,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24904, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -15110,56 +8267,16 @@ static void wooden_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24035,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24035, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24901,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24901, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24039,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24039, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24905,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24905, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -15187,56 +8304,16 @@ static void wooden_rc_track_diag_60_deg_up_to_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24037,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24037, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24903,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24903, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24040,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24040, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24906,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24906, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -15252,30 +8329,10 @@ static void wooden_rc_track_diag_60_deg_up_to_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24036,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24036, -16, -16, 16, 16, 2, height, 0, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24902,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24902, -16, -16, 16, 16, 2, height, 0, 0,
                         height);
                     break;
             }
@@ -15287,11 +8344,7 @@ static void wooden_rc_track_diag_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x008AC8A8 */
 static void wooden_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -15303,31 +8356,11 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24062,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24062, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24928,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24928, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -15337,31 +8370,11 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24020,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24020, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24886,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24886, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -15375,57 +8388,17 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24059,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24059, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24925,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24925, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24063,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24063, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24929,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24929, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -15449,57 +8422,17 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24017,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24017, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24883,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24883, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24021,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24021, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24887,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24887, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -15535,57 +8468,17 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24061,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24061, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24927,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24927, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24064,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24064, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24930,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24930, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -15609,57 +8502,17 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24019,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24019, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24885,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24885, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24022,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24022, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24888,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24888, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -15679,31 +8532,11 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24060,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24060, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24926,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24926, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -15713,31 +8546,11 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24018,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24018, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24884,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24884, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -15749,11 +8562,7 @@ static void wooden_rc_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008AC918 */
 static void wooden_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -15765,31 +8574,11 @@ static void wooden_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24066,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24066, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24932,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24932, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -15799,31 +8588,11 @@ static void wooden_rc_track_diag_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24024,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24024, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24890,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24890, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -15837,57 +8606,17 @@ static void wooden_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24067,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24067, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24933,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24933, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24070,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_track_colour(session) | 24070, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24936,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24936, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -15911,57 +8640,17 @@ static void wooden_rc_track_diag_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24025,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24025, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24891,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24891, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24028,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_track_colour(session) | 24028, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24894,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24894, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -15997,57 +8686,17 @@ static void wooden_rc_track_diag_25_deg_down(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24065,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24065, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24931,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24931, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24069,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_track_colour(session) | 24069, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24935,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24935, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -16071,57 +8720,17 @@ static void wooden_rc_track_diag_25_deg_down(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24023,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24023, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24889,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24889, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24027,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_track_colour(session) | 24027, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24893,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 43);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24893, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 43);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -16141,31 +8750,11 @@ static void wooden_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24068,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24068, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24934,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24934, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -16175,31 +8764,11 @@ static void wooden_rc_track_diag_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24026,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24026, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24892,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24892, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -16211,11 +8780,7 @@ static void wooden_rc_track_diag_25_deg_down(
 
 /** rct2: 0x008AC948 */
 static void wooden_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -16225,30 +8790,10 @@ static void wooden_rc_track_diag_60_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24042,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24042, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24908,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24908, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -16260,56 +8805,16 @@ static void wooden_rc_track_diag_60_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24043,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24043, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24909,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24909, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24046,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24046, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 91);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24912,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24912, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 91);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -16337,56 +8842,16 @@ static void wooden_rc_track_diag_60_deg_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24041,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24041, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24907,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24907, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24045,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24045, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 91);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24911,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24911, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 91);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -16402,30 +8867,10 @@ static void wooden_rc_track_diag_60_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24044,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24044, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24910,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24910, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -16437,11 +8882,7 @@ static void wooden_rc_track_diag_60_deg_down(
 
 /** rct2: 0x008AC8F8 */
 static void wooden_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -16453,31 +8894,11 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24060,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24060, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24926,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24926, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -16487,31 +8908,11 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24018,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24018, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24884,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24884, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -16523,57 +8924,17 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24061,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24061, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24927,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24927, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24064,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24064, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24930,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24930, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -16597,57 +8958,17 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24019,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24019, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24885,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24885, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24022,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24022, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24888,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24888, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -16681,57 +9002,17 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24059,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24059, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24925,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24925, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24063,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24063, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24929,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24929, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -16755,57 +9036,17 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24017,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24017, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24883,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24883, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24021,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24021, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24887,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24887, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_b_supports_paint_setup(
                             session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
@@ -16823,31 +9064,11 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24062,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24062, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24928,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24928, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -16857,31 +9078,11 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24020,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24020, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24886,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24886, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -16894,11 +9095,7 @@ static void wooden_rc_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008AC928 */
 static void wooden_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -16908,30 +9105,10 @@ static void wooden_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24036,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24036, -16, -16, 16, 16, 2, height, 0, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24902,
-                        -16,
-                        -16,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24902, -16, -16, 16, 16, 2, height, 0, 0,
                         height);
                     break;
             }
@@ -16943,56 +9120,16 @@ static void wooden_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24037,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24037, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24903,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24903, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24040,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24040, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24906,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24906, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -17020,56 +9157,16 @@ static void wooden_rc_track_diag_25_deg_down_to_60_deg_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24035,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24035, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24901,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24901, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24039,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24039, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24905,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24905, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -17085,30 +9182,10 @@ static void wooden_rc_track_diag_25_deg_down_to_60_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24038,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24038, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24904,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24904, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -17120,11 +9197,7 @@ static void wooden_rc_track_diag_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008AC938 */
 static void wooden_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -17134,30 +9207,10 @@ static void wooden_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24030,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24030, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24896,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24896, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -17169,56 +9222,16 @@ static void wooden_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24031,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24031, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24897,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24897, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24034,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24034, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24900,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24900, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -17246,56 +9259,16 @@ static void wooden_rc_track_diag_60_deg_down_to_25_deg_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24029,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24029, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24895,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24895, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24033,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24033, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24899,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24899, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 59);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -17311,30 +9284,10 @@ static void wooden_rc_track_diag_60_deg_down_to_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24032,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24032, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24898,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24898, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -17346,11 +9299,7 @@ static void wooden_rc_track_diag_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008AC908 */
 static void wooden_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -17362,31 +9311,11 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24054,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24054, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24920,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24920, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -17396,31 +9325,11 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 3:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24012,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24012, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24878,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24878, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -17434,57 +9343,17 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24055,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24055, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24921,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24921, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24058,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24058, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24924,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24924, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -17504,57 +9373,17 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 0:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24013,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24013, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24879,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24879, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24016,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24016, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24882,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24882, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 1:
@@ -17584,57 +9413,17 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24053,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24053, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24919,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24919, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24057,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24057, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24923,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24923, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -17654,57 +9443,17 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(
                         break;
                     case 2:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24011,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24011, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24877,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24877, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24015,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_track_colour(session) | 24015, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24881,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            0,
-                            height,
-                            -16,
-                            -16,
-                            height + 35);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24881, -16, -16, 32, 32, 0, height, -16,
+                            -16, height + 35);
                         wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                         break;
                     case 3:
@@ -17722,31 +9471,11 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24056,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24056, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24922,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24922, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -17756,31 +9485,11 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(
                 {
                     case 1:
                         sub_98197C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_track_colour(session) | 24014,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_track_colour(session) | 24014, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         sub_98199C_rotated(
-                            session,
-                            direction,
-                            wooden_rc_get_rails_colour(session) | 24880,
-                            -16,
-                            -16,
-                            32,
-                            32,
-                            2,
-                            height,
-                            -16,
-                            -16,
-                            height);
+                            session, direction, wooden_rc_get_rails_colour(session) | 24880, -16, -16, 32, 32, 2, height, -16,
+                            -16, height);
                         break;
                 }
             }
@@ -17792,11 +9501,7 @@ static void wooden_rc_track_diag_25_deg_down_to_flat(
 
 /** rct2: 0x008ACA18 */
 static void wooden_rc_track_diag_flat_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -17806,30 +9511,10 @@ static void wooden_rc_track_diag_flat_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24080,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24080, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24946,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24946, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -17841,56 +9526,16 @@ static void wooden_rc_track_diag_flat_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24077,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24077, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24943,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24943, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24081,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24081, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24947,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24947, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -17918,56 +9563,16 @@ static void wooden_rc_track_diag_flat_to_left_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24079,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24079, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24945,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24945, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24082,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24082, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24948,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24948, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -17983,30 +9588,10 @@ static void wooden_rc_track_diag_flat_to_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24078,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24078, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24944,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24944, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -18018,11 +9603,7 @@ static void wooden_rc_track_diag_flat_to_left_bank(
 
 /** rct2: 0x008AC9F8 */
 static void wooden_rc_track_diag_flat_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -18032,30 +9613,10 @@ static void wooden_rc_track_diag_flat_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24086,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24086, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24952,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24952, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -18067,56 +9628,16 @@ static void wooden_rc_track_diag_flat_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24083,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24083, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24949,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24949, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24087,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24087, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24953,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24953, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -18144,56 +9665,16 @@ static void wooden_rc_track_diag_flat_to_right_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24085,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24085, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24951,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24951, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24088,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24088, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24954,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24954, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -18209,30 +9690,10 @@ static void wooden_rc_track_diag_flat_to_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24084,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24084, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24950,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24950, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -18244,11 +9705,7 @@ static void wooden_rc_track_diag_flat_to_right_bank(
 
 /** rct2: 0x008ACA08 */
 static void wooden_rc_track_diag_left_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -18258,30 +9715,10 @@ static void wooden_rc_track_diag_left_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24084,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24084, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24950,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24950, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -18293,56 +9730,16 @@ static void wooden_rc_track_diag_left_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24085,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24085, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24951,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24951, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24088,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24088, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24954,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24954, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -18370,56 +9767,16 @@ static void wooden_rc_track_diag_left_bank_to_flat(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24083,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24083, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24949,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24949, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24087,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24087, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24953,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24953, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -18435,30 +9792,10 @@ static void wooden_rc_track_diag_left_bank_to_flat(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24086,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24086, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24952,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24952, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -18470,11 +9807,7 @@ static void wooden_rc_track_diag_left_bank_to_flat(
 
 /** rct2: 0x008ACA28 */
 static void wooden_rc_track_diag_right_bank_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -18484,30 +9817,10 @@ static void wooden_rc_track_diag_right_bank_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24078,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24078, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24944,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24944, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -18519,56 +9832,16 @@ static void wooden_rc_track_diag_right_bank_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24079,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24079, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24945,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24945, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24082,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24082, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24948,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24948, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -18596,56 +9869,16 @@ static void wooden_rc_track_diag_right_bank_to_flat(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24077,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24077, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24943,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24943, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24081,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24081, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24947,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24947, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -18661,30 +9894,10 @@ static void wooden_rc_track_diag_right_bank_to_flat(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24080,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24080, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24946,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24946, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -18696,11 +9909,7 @@ static void wooden_rc_track_diag_right_bank_to_flat(
 
 /** rct2: 0x008ACA58 */
 static void wooden_rc_track_diag_left_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -18710,30 +9919,10 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24104,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24104, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24970,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24970, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -18745,56 +9934,16 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24101,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24101, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24967,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24967, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24105,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24105, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24971,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24971, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -18822,56 +9971,16 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24103,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24103, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24969,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24969, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24106,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24106, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24972,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24972, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -18887,30 +9996,10 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24102,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24102, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24968,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24968, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -18922,11 +10011,7 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_up(
 
 /** rct2: 0x008ACA68 */
 static void wooden_rc_track_diag_right_bank_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -18936,30 +10021,10 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24110,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24110, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24976,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24976, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -18971,56 +10036,16 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24107,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24107, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24973,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24973, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24111,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24111, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24977,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24977, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -19048,56 +10073,16 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_up(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24109,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24109, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24975,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24975, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24112,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24112, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24978,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24978, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -19113,30 +10098,10 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24108,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24108, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24974,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24974, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -19148,11 +10113,7 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_up(
 
 /** rct2: 0x008ACA38 */
 static void wooden_rc_track_diag_25_deg_up_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -19162,30 +10123,10 @@ static void wooden_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24092,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24092, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24958,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24958, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -19197,56 +10138,16 @@ static void wooden_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24089,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24089, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24955,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24955, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24093,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24093, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24959,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24959, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -19274,56 +10175,16 @@ static void wooden_rc_track_diag_25_deg_up_to_left_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24091,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24091, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24957,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24957, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24094,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24094, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24960,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24960, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -19339,30 +10200,10 @@ static void wooden_rc_track_diag_25_deg_up_to_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24090,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24090, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24956,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24956, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -19374,11 +10215,7 @@ static void wooden_rc_track_diag_25_deg_up_to_left_bank(
 
 /** rct2: 0x008ACA48 */
 static void wooden_rc_track_diag_25_deg_up_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -19388,30 +10225,10 @@ static void wooden_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24098,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24098, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24964,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24964, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -19423,56 +10240,16 @@ static void wooden_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24095,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24095, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24961,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24961, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24099,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24099, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24965,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24965, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -19500,56 +10277,16 @@ static void wooden_rc_track_diag_25_deg_up_to_right_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24097,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24097, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24963,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24963, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24100,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24100, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24966,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24966, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -19565,30 +10302,10 @@ static void wooden_rc_track_diag_25_deg_up_to_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24096,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24096, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24962,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24962, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -19600,11 +10317,7 @@ static void wooden_rc_track_diag_25_deg_up_to_right_bank(
 
 /** rct2: 0x008ACA78 */
 static void wooden_rc_track_diag_left_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -19614,30 +10327,10 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24096,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24096, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24962,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24962, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -19647,56 +10340,16 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24097,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24097, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24963,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24963, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24100,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24100, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24966,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24966, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -19722,56 +10375,16 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24095,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24095, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24961,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24961, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24099,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24099, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24965,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24965, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -19785,30 +10398,10 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24098,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24098, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24964,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24964, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -19821,11 +10414,7 @@ static void wooden_rc_track_diag_left_bank_to_25_deg_down(
 
 /** rct2: 0x008ACA88 */
 static void wooden_rc_track_diag_right_bank_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -19835,30 +10424,10 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24090,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24090, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24956,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24956, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -19868,56 +10437,16 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24091,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24091, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24957,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24957, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24094,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24094, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24960,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24960, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -19943,56 +10472,16 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_down(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24089,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24089, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24955,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24955, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24093,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24093, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24959,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24959, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_b_supports_paint_setup(session, 2, 0, height + 16, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -20006,30 +10495,10 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24092,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24092, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24958,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24958, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -20042,11 +10511,7 @@ static void wooden_rc_track_diag_right_bank_to_25_deg_down(
 
 /** rct2: 0x008ACA98 */
 static void wooden_rc_track_diag_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -20056,30 +10521,10 @@ static void wooden_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24108,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24108, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24974,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24974, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -20091,56 +10536,16 @@ static void wooden_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24109,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24109, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24975,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24975, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24112,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24112, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24978,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24978, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -20168,56 +10573,16 @@ static void wooden_rc_track_diag_25_deg_down_to_left_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24107,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24107, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24973,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24973, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24111,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24111, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24977,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24977, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -20233,30 +10598,10 @@ static void wooden_rc_track_diag_25_deg_down_to_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24110,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24110, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24976,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24976, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -20268,11 +10613,7 @@ static void wooden_rc_track_diag_25_deg_down_to_left_bank(
 
 /** rct2: 0x008ACAA8 */
 static void wooden_rc_track_diag_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -20282,30 +10623,10 @@ static void wooden_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24102,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24102, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24968,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24968, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -20317,56 +10638,16 @@ static void wooden_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24103,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24103, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24969,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24969, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24106,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24106, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24972,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24972, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -20394,56 +10675,16 @@ static void wooden_rc_track_diag_25_deg_down_to_right_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24101,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24101, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24967,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24967, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24105,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24105, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24971,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24971, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 35);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -20459,30 +10700,10 @@ static void wooden_rc_track_diag_25_deg_down_to_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24104,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24104, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24970,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24970, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -20494,11 +10715,7 @@ static void wooden_rc_track_diag_25_deg_down_to_right_bank(
 
 /** rct2: 0x008AC9D8 */
 static void wooden_rc_track_diag_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -20508,30 +10725,10 @@ static void wooden_rc_track_diag_left_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24074,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24074, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24940,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24940, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -20543,56 +10740,16 @@ static void wooden_rc_track_diag_left_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24071,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24071, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24937,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24937, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24075,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24075, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24941,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24941, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -20620,56 +10777,16 @@ static void wooden_rc_track_diag_left_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24073,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24073, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24939,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24939, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24076,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24076, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24942,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24942, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -20685,30 +10802,10 @@ static void wooden_rc_track_diag_left_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24072,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24072, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24938,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24938, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -20720,11 +10817,7 @@ static void wooden_rc_track_diag_left_bank(
 
 /** rct2: 0x008AC9E8 */
 static void wooden_rc_track_diag_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -20734,30 +10827,10 @@ static void wooden_rc_track_diag_right_bank(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24072,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24072, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24938,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24938, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -20769,56 +10842,16 @@ static void wooden_rc_track_diag_right_bank(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24073,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24073, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24939,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24939, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24076,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24076, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24942,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24942, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -20846,56 +10879,16 @@ static void wooden_rc_track_diag_right_bank(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24071,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24071, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24937,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24937, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24075,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24075, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24941,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        0,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24941, -16, -16, 32, 32, 0, height, -16, -16,
                         height + 27);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -20911,30 +10904,10 @@ static void wooden_rc_track_diag_right_bank(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24074,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24074, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24940,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        2,
-                        height,
-                        -16,
-                        -16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24940, -16, -16, 32, 32, 2, height, -16, -16,
                         height);
                     break;
             }
@@ -20946,11 +10919,7 @@ static void wooden_rc_track_diag_right_bank(
 
 /** rct2: 0x008ACB38 */
 static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -20971,30 +10940,10 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24826, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23971,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23971, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24837,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24837, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21011,30 +10960,10 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24822, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23969,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23969, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24835,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24835, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21070,30 +10999,10 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24825, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23970,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23970, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24836,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24836, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21103,30 +11012,10 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24827, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23972,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23972, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24838,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24838, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21136,30 +11025,10 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24821, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23968,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23968, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24834,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24834, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21181,11 +11050,7 @@ static void wooden_rc_track_left_bank_to_left_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008ACB48 */
 static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -21199,30 +11064,10 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24813, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23963,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23963, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24829,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24829, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21239,30 +11084,10 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24817, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23966,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23966, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24832,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24832, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21298,30 +11123,10 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24814, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23964,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23964, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24830,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24830, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21331,30 +11136,10 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24816, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23965,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23965, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24831,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24831, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21364,30 +11149,10 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24818, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23967,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23967, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24833,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24833, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21416,11 +11181,7 @@ static void wooden_rc_track_right_bank_to_right_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008ACB58 */
 static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -21434,30 +11195,10 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24816, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23965,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23965, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24831,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24831, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21467,30 +11208,10 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24818, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23967,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23967, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24833,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24833, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21507,30 +11228,10 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24814, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23964,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23964, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24830,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24830, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21566,30 +11267,10 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24817, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23966,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23966, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24832,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24832, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21606,30 +11287,10 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24813, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23963,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23963, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24829,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24829, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21651,11 +11312,7 @@ static void wooden_rc_track_left_quarter_turn_3_25_deg_down_to_left_bank(
 
 /** rct2: 0x008ACB68 */
 static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -21669,30 +11326,10 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24821, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23968,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23968, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24834,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24834, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21709,30 +11346,10 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24825, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23970,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23970, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24836,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24836, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21742,30 +11359,10 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24827, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23972,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23972, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24838,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24838, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21794,30 +11391,10 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24822, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23969,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23969, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24835,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24835, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21834,30 +11411,10 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24826, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23971,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23971, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24837,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24837, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21886,27 +11443,12 @@ static void wooden_rc_track_right_quarter_turn_3_25_deg_down_to_right_bank(
 
 /** rct2: 0x008ACDF8 */
 static void wooden_rc_track_block_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_paint(
-        session,
-        _wooden_rc_block_brakes_image_ids[direction][0],
-        _wooden_rc_block_brakes_image_ids[direction][1],
-        direction,
-        0,
-        2,
-        32,
-        25,
-        2,
-        height,
-        0,
-        3,
-        height);
+        session, _wooden_rc_block_brakes_image_ids[direction][0], _wooden_rc_block_brakes_image_ids[direction][1], direction, 0,
+        2, 32, 25, 2, height, 0, 3, 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_6);
     paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@@ -21915,11 +11457,7 @@ static void wooden_rc_track_block_brakes(
 
 /** rct2: 0x008ACCB8 */
 static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -21940,30 +11478,10 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24800, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23945,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23945, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24811,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24811, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -21980,30 +11498,10 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24796, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23943,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23943, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24809,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24809, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22039,30 +11537,10 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24799, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23944,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23944, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24810,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24810, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22072,30 +11550,10 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24801, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23946,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23946, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24812,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24812, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22105,30 +11563,10 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24795, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23942,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23942, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24808,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24808, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22150,11 +11588,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008ACCC8 */
 static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -22168,30 +11602,10 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24787, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23937,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23937, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24803,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24803, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22208,30 +11622,10 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24791, 0, 6, 32, 20, 2, height, 0, 6, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23940,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_track_colour(session) | 23940, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24806,
-                        0,
-                        6,
-                        32,
-                        20,
-                        0,
-                        height,
-                        0,
-                        6,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24806, 0, 6, 32, 20, 0, height, 0, 6,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22267,30 +11661,10 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24788, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23938,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23938, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24804,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24804, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22300,30 +11674,10 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24790, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23939,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23939, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24805,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24805, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22333,30 +11687,10 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 24792, 6, 0, 20, 32, 2, height, 6, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 23941,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 23941, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 24807,
-                        6,
-                        0,
-                        20,
-                        32,
-                        0,
-                        height,
-                        6,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 24807, 6, 0, 20, 32, 0, height, 6, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22385,11 +11719,7 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_up(
 
 /** rct2: 0x008ACCD8 */
 static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -22399,11 +11729,7 @@ static void wooden_rc_track_left_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008ACCE8 */
 static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -22413,11 +11739,7 @@ static void wooden_rc_track_right_banked_quarter_turn_3_25_deg_down(
 
 /** rct2: 0x008ACC38 */
 static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -22438,30 +11760,10 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25192, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24352,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_track_colour(session) | 24352, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25218,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25218, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22508,114 +11810,34 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25193, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24353,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24353, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25219,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25219, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24332,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24332, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25198,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25198, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24337,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24337, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25203,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25203, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24359,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24359, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25225,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25225, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22624,8 +11846,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -22633,114 +11854,34 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24323,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24323, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25189,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25189, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24328,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24328, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25194,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25194, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24354,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24354, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25220,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25220, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 59);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24333,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24333, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25199,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25199, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22750,30 +11891,10 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25204, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24360,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24360, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25226,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25226, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 59);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22783,8 +11904,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 4:
@@ -22797,30 +11917,10 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24324,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24324, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25190,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25190, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22830,30 +11930,10 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25195, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24355,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24355, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25221,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25221, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22863,85 +11943,25 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25200, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24357,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24357, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25223,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25223, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24339,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24339, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25205,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25205, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24361,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24361, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25227,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25227, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -22950,8 +11970,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -22970,30 +11989,10 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25196, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24356,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24356, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25222,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25222, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 0, 9, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -23003,30 +12002,10 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25201, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24358,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24358, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25224,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25224, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -23036,30 +12015,10 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25206, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24362,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24362, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25228,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25228, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -23081,11 +12040,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008ACC48 */
 static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -23113,30 +12068,10 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25177, 0, 0, 32, 27, 2, height, 0, 2, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24347,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_track_colour(session) | 24347, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25213,
-                        0,
-                        0,
-                        32,
-                        27,
-                        0,
-                        height,
-                        0,
-                        2,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25213, 0, 0, 32, 27, 0, height, 0, 2,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -23165,85 +12100,25 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24302,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24302, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25168,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25168, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24341,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24341, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25207,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25207, 0, 0, 32, 16, 0, height, 0, 16,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24307,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24307, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25173,
-                        0,
-                        0,
-                        32,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25173, 0, 0, 32, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -23253,30 +12128,10 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25178, 0, 0, 32, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24348,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24348, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25214,
-                        0,
-                        0,
-                        32,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25214, 0, 0, 32, 16, 0, height, 0, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -23292,8 +12147,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 3:
@@ -23305,143 +12159,43 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25169, 0, 0, 16, 16, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24342,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24342, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25208,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25208, 0, 0, 16, 16, 0, height, 0, 0,
                         height + 59);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24308,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24308, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25174,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25174, 0, 0, 16, 16, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24313,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24313, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25179,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25179, 0, 0, 16, 16, 2, height, 16, 16,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24349,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24349, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 59);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25215,
-                        0,
-                        0,
-                        16,
-                        16,
-                        0,
-                        height,
-                        16,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25215, 0, 0, 16, 16, 0, height, 16, 16,
                         height + 59);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24318,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_track_colour(session) | 24318, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25184,
-                        0,
-                        0,
-                        16,
-                        16,
-                        2,
-                        height,
-                        0,
-                        16,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25184, 0, 0, 16, 16, 2, height, 0, 16,
                         height);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -23451,8 +12205,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 64, 0x20);
             break;
         case 4:
@@ -23465,56 +12218,16 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24304,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24304, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25170,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25170, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24343,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24343, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25209,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25209, 0, 0, 16, 32, 0, height, 16, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 4, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -23524,30 +12237,10 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25175, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24345,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24345, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25211,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25211, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 5, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -23557,59 +12250,19 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25180, 0, 0, 16, 32, 2, height, 0, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24350,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24350, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25216,
-                        0,
-                        0,
-                        16,
-                        32,
-                        0,
-                        height,
-                        0,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25216, 0, 0, 16, 32, 0, height, 0, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 2, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24319,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24319, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25185,
-                        0,
-                        0,
-                        16,
-                        32,
-                        2,
-                        height,
-                        16,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25185, 0, 0, 16, 32, 2, height, 16, 0,
                         height);
                     wooden_a_supports_paint_setup(session, 3, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -23618,8 +12271,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 72, 0x20);
             break;
         case 6:
@@ -23631,30 +12283,10 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25171, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24344,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24344, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25210,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25210, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 1, 10, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -23664,30 +12296,10 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25176, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24346,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24346, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25212,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25212, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 0, 11, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -23697,30 +12309,10 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
                     sub_98199C_rotated(
                         session, direction, wooden_rc_get_rails_colour(session) | 25181, 0, 0, 27, 32, 2, height, 2, 0, height);
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_track_colour(session) | 24351,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_track_colour(session) | 24351, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     sub_98199C_rotated(
-                        session,
-                        direction,
-                        wooden_rc_get_rails_colour(session) | 25217,
-                        0,
-                        0,
-                        27,
-                        32,
-                        0,
-                        height,
-                        2,
-                        0,
+                        session, direction, wooden_rc_get_rails_colour(session) | 25217, 0, 0, 27, 32, 0, height, 2, 0,
                         height + 67);
                     wooden_a_supports_paint_setup(session, 1, 12, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
                     break;
@@ -23749,11 +12341,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_up(
 
 /** rct2: 0x008ACC58 */
 static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -23763,11 +12351,7 @@ static void wooden_rc_track_left_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008ACC68 */
 static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -23777,11 +12361,7 @@ static void wooden_rc_track_right_banked_quarter_turn_5_25_deg_down(
 
 /** rct2: 0x008ACCF8 */
 static void wooden_rc_track_25_deg_up_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -23829,11 +12409,7 @@ static void wooden_rc_track_25_deg_up_to_left_banked_25_deg_up(
 
 /** rct2: 0x008ACD08 */
 static void wooden_rc_track_25_deg_up_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -23881,11 +12457,7 @@ static void wooden_rc_track_25_deg_up_to_right_banked_25_deg_up(
 
 /** rct2: 0x008ACD18 */
 static void wooden_rc_track_left_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -23933,11 +12505,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x008ACD28 */
 static void wooden_rc_track_right_banked_25_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -23985,11 +12553,7 @@ static void wooden_rc_track_right_banked_25_deg_up_to_25_deg_up(
 
 /** rct2: 0x008ACD38 */
 static void wooden_rc_track_25_deg_down_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_right_banked_25_deg_up_to_25_deg_up(
@@ -23998,11 +12562,7 @@ static void wooden_rc_track_25_deg_down_to_left_banked_25_deg_down(
 
 /** rct2: 0x008ACD48 */
 static void wooden_rc_track_25_deg_down_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_left_banked_25_deg_up_to_25_deg_up(
@@ -24011,11 +12571,7 @@ static void wooden_rc_track_25_deg_down_to_right_banked_25_deg_down(
 
 /** rct2: 0x008ACD58 */
 static void wooden_rc_track_left_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_25_deg_up_to_right_banked_25_deg_up(
@@ -24024,11 +12580,7 @@ static void wooden_rc_track_left_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x008ACD68 */
 static void wooden_rc_track_right_banked_25_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_25_deg_up_to_left_banked_25_deg_up(
@@ -24037,11 +12589,7 @@ static void wooden_rc_track_right_banked_25_deg_down_to_25_deg_down(
 
 /** rct2: 0x008ACD78 */
 static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -24097,11 +12645,7 @@ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x008ACD88 */
 static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -24157,11 +12701,7 @@ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x008ACD98 */
 static void wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -24217,11 +12757,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(
 
 /** rct2: 0x008ACDA8 */
 static void wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -24277,11 +12813,7 @@ static void wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(
 
 /** rct2: 0x008ACDB8 */
 static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_right_banked_25_deg_up_to_right_banked_flat(
@@ -24290,11 +12822,7 @@ static void wooden_rc_track_left_banked_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x008ACDC8 */
 static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_left_banked_25_deg_up_to_left_banked_flat(
@@ -24303,11 +12831,7 @@ static void wooden_rc_track_right_banked_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x008ACDD8 */
 static void wooden_rc_track_left_banked_25_deg_down_to_left_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_right_banked_flat_to_right_banked_25_deg_up(
@@ -24316,11 +12840,7 @@ static void wooden_rc_track_left_banked_25_deg_down_to_left_banked_flat(
 
 /** rct2: 0x008ACDE8 */
 static void wooden_rc_track_right_banked_25_deg_down_to_right_banked_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_left_banked_flat_to_left_banked_25_deg_up(
@@ -24329,11 +12849,7 @@ static void wooden_rc_track_right_banked_25_deg_down_to_right_banked_flat(
 
 /** rct2: 0x008ACBB8 */
 static void wooden_rc_track_flat_to_left_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -24389,11 +12905,7 @@ static void wooden_rc_track_flat_to_left_banked_25_deg_up(
 
 /** rct2: 0x008ACBC8 */
 static void wooden_rc_track_flat_to_right_banked_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -24449,11 +12961,7 @@ static void wooden_rc_track_flat_to_right_banked_25_deg_up(
 
 /** rct2: 0x008ACBD8 */
 static void wooden_rc_track_left_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -24509,11 +13017,7 @@ static void wooden_rc_track_left_banked_25_deg_up_to_flat(
 
 /** rct2: 0x008ACBE8 */
 static void wooden_rc_track_right_banked_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -24569,11 +13073,7 @@ static void wooden_rc_track_right_banked_25_deg_up_to_flat(
 
 /** rct2: 0x008ACBF8 */
 static void wooden_rc_track_flat_to_left_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_right_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -24581,11 +13081,7 @@ static void wooden_rc_track_flat_to_left_banked_25_deg_down(
 
 /** rct2: 0x008ACC08 */
 static void wooden_rc_track_flat_to_right_banked_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_left_banked_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -24593,11 +13089,7 @@ static void wooden_rc_track_flat_to_right_banked_25_deg_down(
 
 /** rct2: 0x008ACC18 */
 static void wooden_rc_track_left_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_flat_to_right_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -24605,11 +13097,7 @@ static void wooden_rc_track_left_banked_25_deg_down_to_flat(
 
 /** rct2: 0x008ACC28 */
 static void wooden_rc_track_right_banked_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_rc_track_flat_to_left_banked_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
diff --git a/src/openrct2/ride/coaster/WoodenWildMouse.cpp b/src/openrct2/ride/coaster/WoodenWildMouse.cpp
index bb627da2df..6f57135ef8 100644
--- a/src/openrct2/ride/coaster/WoodenWildMouse.cpp
+++ b/src/openrct2/ride/coaster/WoodenWildMouse.cpp
@@ -123,11 +123,7 @@ enum
 
 /** rct2: 0x008A5464 */
 static void wooden_wild_mouse_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4] = {
@@ -144,19 +140,14 @@ static void wooden_wild_mouse_track_flat(
     paint_util_set_segment_support_height(
         session,
         paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_C8 | SEGMENT_D4, direction),
-        height,
-        0x20);
+        height, 0x20);
     paint_util_set_segment_support_height(
         session, paint_util_rotate_segments(SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0, direction), 0xFFFF, 0);
     paint_util_set_general_support_height(session, height + 32, 0x20);
 }
 
 static void wooden_wild_mouse_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -167,30 +158,10 @@ static void wooden_wild_mouse_track_station(
     };
 
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][1] | session->TrackColours[SCHEME_MISC],
-        0,
-        0,
-        32,
-        28,
-        1,
-        height - 2,
-        0,
-        2,
+        session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height - 2, 0, 2,
         height);
     sub_98199C_rotated(
-        session,
-        direction,
-        imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-        0,
-        6,
-        32,
-        20,
-        1,
-        height,
-        0,
-        0,
+        session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 6, 32, 20, 1, height, 0, 0,
         height);
     wooden_a_supports_paint_setup(session, direction & 1, 0, height, session->TrackColours[SCHEME_SUPPORTS], nullptr);
     track_paint_util_draw_station(session, rideIndex, direction, height, tileElement);
@@ -201,11 +172,7 @@ static void wooden_wild_mouse_track_station(
 
 /** rct2: 0x008A5474 */
 static void wooden_wild_mouse_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4] = {
@@ -245,11 +212,7 @@ static void wooden_wild_mouse_track_25_deg_up(
 
 /** rct2: 0x008A5484 */
 static void wooden_wild_mouse_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4] = {
@@ -297,11 +260,7 @@ static void wooden_wild_mouse_track_60_deg_up(
 
 /** rct2: 0x008A5494 */
 static void wooden_wild_mouse_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4] = {
@@ -341,11 +300,7 @@ static void wooden_wild_mouse_track_flat_to_25_deg_up(
 
 /** rct2: 0x008A54A4 */
 static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4][2] = {
@@ -396,11 +351,7 @@ static void wooden_wild_mouse_track_25_deg_up_to_60_deg_up(
 }
 
 static void wooden_wild_mouse_track_60_deg_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4][2] = {
@@ -452,11 +403,7 @@ static void wooden_wild_mouse_track_60_deg_to_25_deg_up(
 
 /** rct2: 0x008A54C4 */
 static void wooden_wild_mouse_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4] = {
@@ -496,11 +443,7 @@ static void wooden_wild_mouse_track_25_deg_up_to_flat(
 
 /** rct2: 0x008A54D4 */
 static void wooden_wild_mouse_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_wild_mouse_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -508,11 +451,7 @@ static void wooden_wild_mouse_track_25_deg_down(
 
 /** rct2: 0x008A54E4 */
 static void wooden_wild_mouse_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_wild_mouse_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -520,11 +459,7 @@ static void wooden_wild_mouse_track_60_deg_down(
 
 /** rct2: 0x008A54F4 */
 static void wooden_wild_mouse_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_wild_mouse_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -532,11 +467,7 @@ static void wooden_wild_mouse_track_flat_to_25_deg_down(
 
 /** rct2: 0x008A5504 */
 static void wooden_wild_mouse_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_wild_mouse_track_60_deg_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -544,11 +475,7 @@ static void wooden_wild_mouse_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x008A5514 */
 static void wooden_wild_mouse_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_wild_mouse_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -556,22 +483,14 @@ static void wooden_wild_mouse_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x008A5524 */
 static void wooden_wild_mouse_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_wild_mouse_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void wooden_wild_mouse_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const sprite_bb imageIds[4][3] = {
@@ -629,11 +548,7 @@ static void wooden_wild_mouse_track_right_quarter_turn_3(
 }
 
 static void wooden_wild_mouse_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -641,11 +556,7 @@ static void wooden_wild_mouse_track_left_quarter_turn_3(
 }
 
 static void wooden_wild_mouse_track_left_quarter_turn_1(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4] = {
@@ -680,11 +591,7 @@ static void wooden_wild_mouse_track_left_quarter_turn_1(
 
 /** rct2: 0x008A55D4 */
 static void wooden_wild_mouse_track_right_quarter_turn_1(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_wild_mouse_track_left_quarter_turn_1(session, rideIndex, trackSequence, (direction - 1) & 3, height, tileElement);
@@ -692,11 +599,7 @@ static void wooden_wild_mouse_track_right_quarter_turn_1(
 
 /** rct2: 0x008A55E4 */
 static void wooden_wild_mouse_track_flat_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4][2] = {
@@ -747,11 +650,7 @@ static void wooden_wild_mouse_track_flat_to_60_deg_up(
 
 /** rct2: 0x008A55F4 */
 static void wooden_wild_mouse_track_60_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4][2] = {
@@ -802,11 +701,7 @@ static void wooden_wild_mouse_track_60_deg_up_to_flat(
 
 /** rct2: 0x008A5604 */
 static void wooden_wild_mouse_track_flat_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_wild_mouse_track_60_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -814,11 +709,7 @@ static void wooden_wild_mouse_track_flat_to_60_deg_down(
 
 /** rct2: 0x008A5614 */
 static void wooden_wild_mouse_track_60_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     wooden_wild_mouse_track_flat_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
diff --git a/src/openrct2/ride/gentle/CarRide.cpp b/src/openrct2/ride/gentle/CarRide.cpp
index 02643f0042..c19ce5056e 100644
--- a/src/openrct2/ride/gentle/CarRide.cpp
+++ b/src/openrct2/ride/gentle/CarRide.cpp
@@ -133,27 +133,19 @@ static constexpr const uint32_t car_ride_track_pieces_left_quarter_turn_1_tile[4
 };
 
 static constexpr const uint32_t car_ride_track_pieces_quarter_turn_3_tiles[4][3] = {
-    { SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SW_SE_PART_0,
-      SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SW_SE_PART_1,
+    { SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SW_SE_PART_1,
       SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SW_SE_PART_2 },
-    { SPR_CAR_RIDE_QUARTER_TURN_3_TILES_NW_SW_PART_0,
-      SPR_CAR_RIDE_QUARTER_TURN_3_TILES_NW_SW_PART_1,
+    { SPR_CAR_RIDE_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_CAR_RIDE_QUARTER_TURN_3_TILES_NW_SW_PART_1,
       SPR_CAR_RIDE_QUARTER_TURN_3_TILES_NW_SW_PART_2 },
-    { SPR_CAR_RIDE_QUARTER_TURN_3_TILES_NE_NW_PART_0,
-      SPR_CAR_RIDE_QUARTER_TURN_3_TILES_NE_NW_PART_1,
+    { SPR_CAR_RIDE_QUARTER_TURN_3_TILES_NE_NW_PART_0, SPR_CAR_RIDE_QUARTER_TURN_3_TILES_NE_NW_PART_1,
       SPR_CAR_RIDE_QUARTER_TURN_3_TILES_NE_NW_PART_2 },
-    { SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SE_NE_PART_0,
-      SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SE_NE_PART_1,
+    { SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SE_NE_PART_0, SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SE_NE_PART_1,
       SPR_CAR_RIDE_QUARTER_TURN_3_TILES_SE_NE_PART_2 }
 };
 
 /** rct2: 0x006F72C8 */
 static void paint_car_ride_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = car_ride_track_pieces_flat[direction] | session->TrackColours[SCHEME_TRACK];
@@ -184,11 +176,7 @@ static void paint_car_ride_track_flat(
 
 /** rct2: 0x006F72D8 */
 static void paint_car_ride_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = car_ride_track_pieces_25_deg_up[direction] | session->TrackColours[SCHEME_TRACK];
@@ -226,11 +214,7 @@ static void paint_car_ride_track_25_deg_up(
 
 /** rct2: 0x006F72E8 */
 static void paint_car_ride_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = car_ride_track_pieces_flat_to_25_deg_up[direction] | session->TrackColours[SCHEME_TRACK];
@@ -268,11 +252,7 @@ static void paint_car_ride_track_flat_to_25_deg_up(
 
 /** rct2: 0x006F72F8 */
 static void paint_car_ride_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = car_ride_track_pieces_25_deg_up_to_flat[direction] | session->TrackColours[SCHEME_TRACK];
@@ -310,11 +290,7 @@ static void paint_car_ride_track_25_deg_up_to_flat(
 
 /** rct2: 0x006F7308 */
 static void paint_car_ride_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_car_ride_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -322,11 +298,7 @@ static void paint_car_ride_track_25_deg_down(
 
 /** rct2: 0x006F7318 */
 static void paint_car_ride_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_car_ride_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -334,11 +306,7 @@ static void paint_car_ride_track_flat_to_25_deg_down(
 
 /** rct2: 0x006F7328 */
 static void paint_car_ride_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_car_ride_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -346,11 +314,7 @@ static void paint_car_ride_track_25_deg_down_to_flat(
 
 /** rct2: 0x006F7338, 0x006F7348, 0x006F7358 */
 static void paint_car_ride_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -404,24 +368,13 @@ static void paint_car_ride_station(
 
 /** rct2: 0x006F7378 */
 static void paint_car_ride_track_right_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_right_quarter_turn_3_tiles_paint(
-        session,
-        3,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        car_ride_track_pieces_quarter_turn_3_tiles,
-        defaultRightQuarterTurn3TilesOffsets,
-        defaultRightQuarterTurn3TilesBoundLengths,
-        nullptr);
+        session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        car_ride_track_pieces_quarter_turn_3_tiles, defaultRightQuarterTurn3TilesOffsets,
+        defaultRightQuarterTurn3TilesBoundLengths, nullptr);
     track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_0);
 
     switch (trackSequence)
@@ -452,11 +405,7 @@ static void paint_car_ride_track_right_quarter_turn_3_tiles(
 
 /** rct2: 0x006F7368 */
 static void paint_car_ride_track_left_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -466,11 +415,7 @@ static void paint_car_ride_track_left_quarter_turn_3_tiles(
 
 /** rct2: 0x006F7388 */
 static void paint_car_ride_track_left_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = car_ride_track_pieces_left_quarter_turn_1_tile[direction] | session->TrackColours[SCHEME_TRACK];
@@ -501,11 +446,7 @@ static void paint_car_ride_track_left_quarter_turn_1_tile(
 
 /** rct2: 0x006F7398 */
 static void paint_car_ride_track_right_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_car_ride_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement);
@@ -513,11 +454,7 @@ static void paint_car_ride_track_right_quarter_turn_1_tile(
 
 /** rct2: 0x006F73A8 */
 static void paint_car_ride_track_spinning_tunnel(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = car_ride_track_pieces_flat[direction] | session->TrackColours[SCHEME_TRACK];
@@ -550,11 +487,7 @@ static void paint_car_ride_track_spinning_tunnel(
 
 /** rct2: 0x006F73B8 */
 static void paint_car_ride_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -605,11 +538,7 @@ static void paint_car_ride_track_60_deg_up(
 
 /** rct2: 0x006F73C8 */
 static void paint_car_ride_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -667,11 +596,7 @@ static void paint_car_ride_track_25_deg_up_to_60_deg_up(
 
 /** rct2: 0x006F73D8 */
 static void paint_car_ride_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -729,11 +654,7 @@ static void paint_car_ride_track_60_deg_up_to_25_deg_up(
 
 /** rct2: 0x006F73E8 */
 static void paint_car_ride_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_car_ride_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -741,11 +662,7 @@ static void paint_car_ride_track_60_deg_down(
 
 /** rct2: 0x006F73F8 */
 static void paint_car_ride_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_car_ride_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -753,11 +670,7 @@ static void paint_car_ride_track_25_deg_down_to_60_deg_down(
 
 /** rct2: 0x006F7408 */
 static void paint_car_ride_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_car_ride_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -765,11 +678,7 @@ static void paint_car_ride_track_60_deg_down_to_25_deg_down(
 
 /** rct2: 0x006F7418 */
 static void paint_car_ride_track_log_bumps(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = car_ride_track_pieces_log_bumps[direction] | session->TrackColours[SCHEME_TRACK];
diff --git a/src/openrct2/ride/gentle/CircusShow.cpp b/src/openrct2/ride/gentle/CircusShow.cpp
index 9b8389a55e..fd58b81cd5 100644
--- a/src/openrct2/ride/gentle/CircusShow.cpp
+++ b/src/openrct2/ride/gentle/CircusShow.cpp
@@ -49,11 +49,7 @@ static void paint_circus_show_tent(
  * rct2: 0x0076FAD4
  */
 static void paint_circus_show(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_3x3[direction][trackSequence];
@@ -67,14 +63,7 @@ static void paint_circus_show(
     track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork);
 
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_SUPPORTS],
-        height,
-        fenceSpritesRope,
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_SUPPORTS], height, fenceSpritesRope,
         session->CurrentRotation);
 
     switch (trackSequence)
diff --git a/src/openrct2/ride/gentle/CrookedHouse.cpp b/src/openrct2/ride/gentle/CrookedHouse.cpp
index 41b6e33af7..802dc24a48 100644
--- a/src/openrct2/ride/gentle/CrookedHouse.cpp
+++ b/src/openrct2/ride/gentle/CrookedHouse.cpp
@@ -54,25 +54,12 @@ static void paint_crooked_house_structure(
 
     rct_crooked_house_bound_box boundBox = crooked_house_data[segment];
     sub_98197C(
-        session,
-        image_id,
-        x_offset,
-        y_offset,
-        boundBox.length_x,
-        boundBox.length_y,
-        127,
-        height + 3,
-        boundBox.offset_x,
-        boundBox.offset_y,
-        height + 3);
+        session, image_id, x_offset, y_offset, boundBox.length_x, boundBox.length_y, 127, height + 3, boundBox.offset_x,
+        boundBox.offset_y, height + 3);
 }
 
 static void paint_crooked_house(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_3x3[direction][trackSequence];
@@ -86,14 +73,7 @@ static void paint_crooked_house(
     track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork);
 
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_MISC],
-        height,
-        fenceSpritesRope,
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_MISC], height, fenceSpritesRope,
         session->CurrentRotation);
 
     switch (trackSequence)
diff --git a/src/openrct2/ride/gentle/Dodgems.cpp b/src/openrct2/ride/gentle/Dodgems.cpp
index 8063653b65..fbfa20639e 100644
--- a/src/openrct2/ride/gentle/Dodgems.cpp
+++ b/src/openrct2/ride/gentle/Dodgems.cpp
@@ -24,9 +24,8 @@ enum
     SPR_DODGEMS_FENCE_TOP_LEFT = 21937
 };
 
-static constexpr const uint32_t dodgems_fence_sprites[] = {
-    SPR_DODGEMS_FENCE_TOP_RIGHT, SPR_DODGEMS_FENCE_BOTTOM_RIGHT, SPR_DODGEMS_FENCE_BOTTOM_LEFT, SPR_DODGEMS_FENCE_TOP_LEFT
-};
+static constexpr const uint32_t dodgems_fence_sprites[] = { SPR_DODGEMS_FENCE_TOP_RIGHT, SPR_DODGEMS_FENCE_BOTTOM_RIGHT,
+                                                            SPR_DODGEMS_FENCE_BOTTOM_LEFT, SPR_DODGEMS_FENCE_TOP_LEFT };
 
 static void paint_dodgems_roof(paint_session* session, int32_t height, int32_t offset)
 {
@@ -38,11 +37,7 @@ static void paint_dodgems_roof(paint_session* session, int32_t height, int32_t o
 }
 
 static void paint_dodgems(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint8_t relativeTrackSequence = track_map_4x4[direction][trackSequence];
@@ -57,14 +52,7 @@ static void paint_dodgems(
     sub_98197C(session, imageId, 0, 0, 30, 30, 1, height, 1, 1, height);
 
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_SUPPORTS],
-        height,
-        dodgems_fence_sprites,
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_SUPPORTS], height, dodgems_fence_sprites,
         session->CurrentRotation);
 
     switch (direction)
diff --git a/src/openrct2/ride/gentle/FerrisWheel.cpp b/src/openrct2/ride/gentle/FerrisWheel.cpp
index ab2f42d903..b344c8e470 100644
--- a/src/openrct2/ride/gentle/FerrisWheel.cpp
+++ b/src/openrct2/ride/gentle/FerrisWheel.cpp
@@ -90,31 +90,13 @@ static void paint_ferris_wheel_structure(
 
     imageId = (22150 + (direction & 1) * 2) | session->TrackColours[SCHEME_TRACK];
     sub_98197C(
-        session,
-        imageId,
-        xOffset,
-        yOffset,
-        boundBox.length_x,
-        boundBox.length_y,
-        127,
-        height,
-        boundBox.offset_x,
-        boundBox.offset_y,
-        height);
+        session, imageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x,
+        boundBox.offset_y, height);
 
     imageId = (baseImageId + direction * 8 + imageOffset) | imageColourFlags;
     sub_98199C(
-        session,
-        imageId,
-        xOffset,
-        yOffset,
-        boundBox.length_x,
-        boundBox.length_y,
-        127,
-        height,
-        boundBox.offset_x,
-        boundBox.offset_y,
-        height);
+        session, imageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x,
+        boundBox.offset_y, height);
 
     if (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_TRACK && ride->vehicles[0] != SPRITE_INDEX_NULL)
     {
@@ -136,33 +118,15 @@ static void paint_ferris_wheel_structure(
             imageColourFlags = SPRITE_ID_PALETTE_COLOUR_2(vehicle->peep_tshirt_colours[i], vehicle->peep_tshirt_colours[i + 1]);
             imageId = (baseImageId + 32 + direction * 128 + frameNum) | imageColourFlags;
             sub_98199C(
-                session,
-                imageId,
-                xOffset,
-                yOffset,
-                boundBox.length_x,
-                boundBox.length_y,
-                127,
-                height,
-                boundBox.offset_x,
-                boundBox.offset_y,
-                height);
+                session, imageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x,
+                boundBox.offset_y, height);
         }
     }
 
     imageId = (22150 + (direction & 1) * 2 + 1) | session->TrackColours[SCHEME_TRACK];
     sub_98199C(
-        session,
-        imageId,
-        xOffset,
-        yOffset,
-        boundBox.length_x,
-        boundBox.length_y,
-        127,
-        height,
-        boundBox.offset_x,
-        boundBox.offset_y,
-        height);
+        session, imageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x,
+        boundBox.offset_y, height);
 
     session->CurrentlyDrawnItem = savedTileElement;
     session->InteractionType = VIEWPORT_INTERACTION_ITEM_RIDE;
@@ -172,11 +136,7 @@ static void paint_ferris_wheel_structure(
  * rct2: 0x008A8EC4
  */
 static void paint_ferris_wheel(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint8_t relativeTrackSequence = track_map_1x4[direction][trackSequence];
diff --git a/src/openrct2/ride/gentle/FlyingSaucers.cpp b/src/openrct2/ride/gentle/FlyingSaucers.cpp
index d6a70b5138..d7e4f09fd8 100644
--- a/src/openrct2/ride/gentle/FlyingSaucers.cpp
+++ b/src/openrct2/ride/gentle/FlyingSaucers.cpp
@@ -33,11 +33,7 @@ static constexpr const uint32_t flying_saucers_fence_sprites[] = {
  * rct2: 0x008873D8
  */
 static void paint_flying_saucers(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint8_t relativeTrackSequence = track_map_4x4[direction][trackSequence];
@@ -52,14 +48,7 @@ static void paint_flying_saucers(
     sub_98197C(session, imageId, 0, 0, 30, 30, 1, height, 1, 1, height);
 
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_TRACK],
-        height,
-        flying_saucers_fence_sprites,
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_TRACK], height, flying_saucers_fence_sprites,
         session->CurrentRotation);
 
     paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
diff --git a/src/openrct2/ride/gentle/GhostTrain.cpp b/src/openrct2/ride/gentle/GhostTrain.cpp
index 27c81014b5..565fccdf78 100644
--- a/src/openrct2/ride/gentle/GhostTrain.cpp
+++ b/src/openrct2/ride/gentle/GhostTrain.cpp
@@ -103,17 +103,13 @@ static constexpr const uint32_t ghost_train_track_pieces_quarter_turn_1_tile[4]
 };
 
 static constexpr const uint32_t ghost_train_track_pieces_quarter_turn_3_tiles[4][3] = {
-    { SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SW_SE_PART_0,
-      SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SW_SE_PART_1,
+    { SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SW_SE_PART_1,
       SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SW_SE_PART_2 },
-    { SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_NW_SW_PART_0,
-      SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_NW_SW_PART_1,
+    { SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_NW_SW_PART_1,
       SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_NW_SW_PART_2 },
-    { SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_NE_NW_PART_0,
-      SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_NE_NW_PART_1,
+    { SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_NE_NW_PART_0, SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_NE_NW_PART_1,
       SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_NE_NW_PART_2 },
-    { SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SE_NE_PART_0,
-      SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SE_NE_PART_1,
+    { SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SE_NE_PART_0, SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SE_NE_PART_1,
       SPR_GHOST_TRAIN_QUARTER_TURN_3_TILES_SE_NE_PART_2 }
 };
 
@@ -133,11 +129,7 @@ static constexpr const uint32_t ghost_train_track_pieces_brakes[4] = {
 
 /** rct2: 0x00770BEC */
 static void paint_ghost_train_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -174,11 +166,7 @@ static void paint_ghost_train_track_flat(
 
 /** rct2: 0x00770BFC */
 static void paint_ghost_train_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -231,11 +219,7 @@ static void paint_ghost_train_track_25_deg_up(
 
 /** rct2: 0x00770C0C */
 static void paint_ghost_train_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -287,11 +271,7 @@ static void paint_ghost_train_track_flat_to_25_deg_up(
 }
 
 static void paint_ghost_train_track_25_deg_up_to_flat_shared(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -328,11 +308,7 @@ static void paint_ghost_train_track_25_deg_up_to_flat_shared(
 
 /** rct2: 0x00770C1C */
 static void paint_ghost_train_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_ghost_train_track_25_deg_up_to_flat_shared(session, rideIndex, trackSequence, direction, height, tileElement);
@@ -356,11 +332,7 @@ static void paint_ghost_train_track_25_deg_up_to_flat(
 
 /** rct2: 0x00770C2C */
 static void paint_ghost_train_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_ghost_train_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -368,11 +340,7 @@ static void paint_ghost_train_track_25_deg_down(
 
 /** rct2: 0x00770C3C */
 static void paint_ghost_train_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_ghost_train_track_25_deg_up_to_flat_shared(
@@ -397,11 +365,7 @@ static void paint_ghost_train_track_flat_to_25_deg_down(
 
 /** rct2: 0x00770C4C */
 static void paint_ghost_train_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_ghost_train_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -409,11 +373,7 @@ static void paint_ghost_train_track_25_deg_down_to_flat(
 
 /** rct2: 0x00770C5C, 0x00770C6C, 0x00770C7C */
 static void paint_ghost_train_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -467,23 +427,12 @@ static void paint_ghost_train_station(
 
 /** rct2: 0x00770C9C */
 static void paint_ghost_train_track_right_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_right_quarter_turn_3_tiles_paint(
-        session,
-        3,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        ghost_train_track_pieces_quarter_turn_3_tiles,
-        nullptr,
-        defaultRightQuarterTurn3TilesBoundLengths,
+        session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        ghost_train_track_pieces_quarter_turn_3_tiles, nullptr, defaultRightQuarterTurn3TilesBoundLengths,
         defaultRightQuarterTurn3TilesBoundOffsets);
     track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_0);
 
@@ -515,11 +464,7 @@ static void paint_ghost_train_track_right_quarter_turn_3_tiles(
 
 /** rct2: 0x00770CAC */
 static void paint_ghost_train_track_left_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -529,11 +474,7 @@ static void paint_ghost_train_track_left_quarter_turn_3_tiles(
 
 /** rct2: 0x00770CAC */
 static void paint_ghost_train_track_left_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_left_quarter_turn_1_tile_paint(
@@ -547,11 +488,7 @@ static void paint_ghost_train_track_left_quarter_turn_1_tile(
 
 /** rct2: 0x00770CBC */
 static void paint_ghost_train_track_right_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_ghost_train_track_left_quarter_turn_1_tile(
@@ -560,11 +497,7 @@ static void paint_ghost_train_track_right_quarter_turn_1_tile(
 
 /** rct2: 0x00770CCC */
 static void paint_ghost_train_track_spinning_tunnel(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = ghost_train_track_pieces_spinning_tunnel_track[direction] | session->TrackColours[SCHEME_TRACK];
@@ -597,11 +530,7 @@ static void paint_ghost_train_track_spinning_tunnel(
 
 /** rct2: 0x00770CDC */
 static void paint_ghost_train_track_brakes(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp
index 8ce6a343e6..8303731908 100644
--- a/src/openrct2/ride/gentle/HauntedHouse.cpp
+++ b/src/openrct2/ride/gentle/HauntedHouse.cpp
@@ -53,17 +53,8 @@ static void paint_haunted_house_structure(
     uint32_t imageId = (baseImageId + direction) | session->TrackColours[SCHEME_MISC];
     haunted_house_bound_box boundBox = haunted_house_data[part];
     sub_98197C(
-        session,
-        imageId,
-        xOffset,
-        yOffset,
-        boundBox.length_x,
-        boundBox.length_y,
-        127,
-        height,
-        boundBox.offset_x,
-        boundBox.offset_y,
-        height);
+        session, imageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x,
+        boundBox.offset_y, height);
 
     rct_drawpixelinfo* dpi = session->DPI;
     if (dpi->zoom_level == 0 && frameNum != 0)
@@ -85,17 +76,8 @@ static void paint_haunted_house_structure(
         }
         imageId = imageId | session->TrackColours[SCHEME_MISC];
         sub_98199C(
-            session,
-            imageId,
-            xOffset,
-            yOffset,
-            boundBox.length_x,
-            boundBox.length_y,
-            127,
-            height,
-            boundBox.offset_x,
-            boundBox.offset_y,
-            height);
+            session, imageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x,
+            boundBox.offset_y, height);
     }
 
     session->CurrentlyDrawnItem = savedTileElement;
@@ -106,11 +88,7 @@ static void paint_haunted_house_structure(
  * rct2: 0x0076E9B0
  */
 static void paint_haunted_house(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_3x3[direction][trackSequence];
@@ -124,14 +102,7 @@ static void paint_haunted_house(
     track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork);
 
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_MISC],
-        height,
-        fenceSpritesRope,
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_MISC], height, fenceSpritesRope,
         session->CurrentRotation);
 
     switch (trackSequence)
diff --git a/src/openrct2/ride/gentle/Maze.cpp b/src/openrct2/ride/gentle/Maze.cpp
index 8e1188fdfa..b57eba3b47 100644
--- a/src/openrct2/ride/gentle/Maze.cpp
+++ b/src/openrct2/ride/gentle/Maze.cpp
@@ -45,11 +45,7 @@ enum
  * rct: 0x004ACF4A
  */
 static void maze_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint16_t maze_entry = track_element_get_maze_entry(tileElement);
diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp
index eb17460e49..02595948ad 100644
--- a/src/openrct2/ride/gentle/MerryGoRound.cpp
+++ b/src/openrct2/ride/gentle/MerryGoRound.cpp
@@ -105,11 +105,7 @@ static void paint_merry_go_round_structure(
  * rct2: 0x00761B0C
  */
 static void paint_merry_go_round(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_3x3[direction][trackSequence];
@@ -123,14 +119,7 @@ static void paint_merry_go_round(
     track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork);
 
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_MISC],
-        height,
-        fenceSpritesRope,
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_MISC], height, fenceSpritesRope,
         session->CurrentRotation);
 
     switch (trackSequence)
diff --git a/src/openrct2/ride/gentle/MiniGolf.cpp b/src/openrct2/ride/gentle/MiniGolf.cpp
index 30b53ab1d2..b80ad6f845 100644
--- a/src/openrct2/ride/gentle/MiniGolf.cpp
+++ b/src/openrct2/ride/gentle/MiniGolf.cpp
@@ -377,48 +377,20 @@ const size_t mini_golf_peep_animation_lengths[] = {
 };
 
 static paint_struct* mini_golf_paint_util_7c(
-    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,
-    int16_t bound_box_offset_x,
-    int16_t bound_box_offset_y,
-    int16_t bound_box_offset_z,
-    uint32_t rotation)
+    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, int16_t bound_box_offset_x,
+    int16_t bound_box_offset_y, int16_t bound_box_offset_z, uint32_t rotation)
 {
     if (direction & 1)
     {
         return sub_98197C(
-            session,
-            image_id,
-            y_offset,
-            x_offset,
-            bound_box_length_y,
-            bound_box_length_x,
-            bound_box_length_z,
-            z_offset,
-            bound_box_offset_y,
-            bound_box_offset_x,
-            bound_box_offset_z);
+            session, image_id, y_offset, x_offset, bound_box_length_y, bound_box_length_x, bound_box_length_z, z_offset,
+            bound_box_offset_y, bound_box_offset_x, bound_box_offset_z);
     }
 
     return sub_98197C(
-        session,
-        image_id,
-        x_offset,
-        y_offset,
-        bound_box_length_x,
-        bound_box_length_y,
-        bound_box_length_z,
-        z_offset,
-        bound_box_offset_x,
-        bound_box_offset_y,
-        bound_box_offset_z);
+        session, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset,
+        bound_box_offset_x, bound_box_offset_y, bound_box_offset_z);
 }
 
 static bool mini_golf_paint_util_should_draw_fence(paint_session* session, const rct_tile_element* tileElement)
@@ -445,11 +417,7 @@ static bool mini_golf_paint_util_should_draw_fence(paint_session* session, const
 
 /** rct2: 0x0087F10C */
 static void paint_mini_golf_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -496,11 +464,7 @@ static void paint_mini_golf_track_flat(
 
 /** rct2: 0x0087F11C */
 static void paint_mini_golf_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -539,11 +503,7 @@ static void paint_mini_golf_track_25_deg_up(
 
 /** rct2: 0x0087F12C */
 static void paint_mini_golf_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -582,11 +542,7 @@ static void paint_mini_golf_track_flat_to_25_deg_up(
 
 /** rct2: 0x0087F13C */
 static void paint_mini_golf_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -625,11 +581,7 @@ static void paint_mini_golf_track_25_deg_up_to_flat(
 
 /** rct2: 0x0087F14C */
 static void paint_mini_golf_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_mini_golf_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -637,11 +589,7 @@ static void paint_mini_golf_track_25_deg_down(
 
 /** rct2: 0x0087F15C */
 static void paint_mini_golf_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_mini_golf_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -649,11 +597,7 @@ static void paint_mini_golf_track_flat_to_25_deg_down(
 
 /** rct2: 0x0087F16C */
 static void paint_mini_golf_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_mini_golf_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -661,11 +605,7 @@ static void paint_mini_golf_track_25_deg_down_to_flat(
 
 /** rct2: 0x0087F17C, 0x0087F18C, 0x0087F19C */
 static void paint_mini_golf_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -729,11 +669,7 @@ static void paint_mini_golf_station(
 
 /** rct2: 0x0087F1AC */
 static void paint_mini_golf_track_left_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -792,12 +728,7 @@ static void paint_mini_golf_track_left_quarter_turn_1_tile(
     {
         // TODO: The back fence uses the same x/y offsets, but uses another paint function. See if this occurs more often.
         track_paint_util_left_quarter_turn_1_tile_paint(
-            session,
-            0,
-            height,
-            24,
-            direction,
-            session->TrackColours[SCHEME_MISC],
+            session, 0, height, 24, direction, session->TrackColours[SCHEME_MISC],
             mini_golf_track_sprites_quarter_turn_1_tile_fence_front);
 
         switch (direction)
@@ -818,11 +749,7 @@ static void paint_mini_golf_track_left_quarter_turn_1_tile(
 
 /** rct2: 0x0087F1BC */
 static void paint_mini_golf_track_right_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_mini_golf_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement);
@@ -880,11 +807,7 @@ static void paint_mini_golf_hole_ab(
 
 /** rct2: 0x0087F1CC */
 static void paint_mini_golf_hole_a(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_mini_golf_hole_ab(session, trackSequence, direction, height, mini_golf_track_sprites_hole_a);
@@ -892,11 +815,7 @@ static void paint_mini_golf_hole_a(
 
 /** rct2: 0x0087F1DC */
 static void paint_mini_golf_hole_b(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_mini_golf_hole_ab(session, trackSequence, direction, height, mini_golf_track_sprites_hole_b);
@@ -904,11 +823,7 @@ static void paint_mini_golf_hole_b(
 
 /** rct2: 0x0087F1EC */
 static void paint_mini_golf_hole_c(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -975,11 +890,7 @@ static void paint_mini_golf_hole_c(
 
 /** rct2: 0x0087F1FC */
 static void paint_mini_golf_hole_d(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -1069,11 +980,7 @@ static void paint_mini_golf_hole_d(
 
 /** rct2: 0x0087F1FC */
 static void paint_mini_golf_hole_e(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
diff --git a/src/openrct2/ride/gentle/MiniHelicopters.cpp b/src/openrct2/ride/gentle/MiniHelicopters.cpp
index e9ecaae740..ddfec64fc0 100644
--- a/src/openrct2/ride/gentle/MiniHelicopters.cpp
+++ b/src/openrct2/ride/gentle/MiniHelicopters.cpp
@@ -18,11 +18,7 @@
 
 /** rct2: 0x */
 static void paint_mini_helicopters_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -60,11 +56,7 @@ static void paint_mini_helicopters_track_station(
 
 /** rct2: 0x0081F348 */
 static void paint_mini_helicopters_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -86,11 +78,7 @@ static void paint_mini_helicopters_track_flat(
     if (track_paint_util_should_paint_supports(position))
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK,
-            4,
-            -1,
-            height,
+            session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 4, -1, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -101,11 +89,7 @@ static void paint_mini_helicopters_track_flat(
 
 /** rct2: 0x0081F368 */
 static void paint_mini_helicopters_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -147,11 +131,7 @@ static void paint_mini_helicopters_track_flat_to_25_deg_up(
 
 /** rct2: 0x0081F358 */
 static void paint_mini_helicopters_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -193,11 +173,7 @@ static void paint_mini_helicopters_track_25_deg_up(
 
 /** rct2: 0x0081F378 */
 static void paint_mini_helicopters_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -239,11 +215,7 @@ static void paint_mini_helicopters_track_25_deg_up_to_flat(
 
 /** rct2: 0x */
 static void paint_mini_helicopters_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_mini_helicopters_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -251,11 +223,7 @@ static void paint_mini_helicopters_track_flat_to_25_deg_down(
 
 /** rct2: 0x0081F388 */
 static void paint_mini_helicopters_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_mini_helicopters_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -263,11 +231,7 @@ static void paint_mini_helicopters_track_25_deg_down(
 
 /** rct2: 0x0081F3A8 */
 static void paint_mini_helicopters_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_mini_helicopters_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -275,20 +239,11 @@ static void paint_mini_helicopters_track_25_deg_down_to_flat(
 
 /** rct2: 0x0081F3E8 */
 static void paint_mini_helicopters_track_left_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_left_quarter_turn_3_tiles_paint(
-        session,
-        3,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
+        session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
         trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles);
     track_paint_util_left_quarter_turn_3_tiles_tunnel(session, height, TUNNEL_0, direction, trackSequence);
 
@@ -317,11 +272,7 @@ static constexpr const uint8_t mini_helicopters_right_quarter_turn_3_tiles_to_le
 
 /** rct2: 0x0081F3F8 */
 static void paint_mini_helicopters_track_right_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mini_helicopters_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence];
@@ -331,20 +282,11 @@ static void paint_mini_helicopters_track_right_quarter_turn_3_tiles(
 
 /** rct2: 0x0081F408 */
 static void paint_mini_helicopters_track_left_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_left_quarter_turn_1_tile_paint(
-        session,
-        1,
-        height,
-        0,
-        direction,
-        session->TrackColours[SCHEME_TRACK],
+        session, 1, height, 0, direction, session->TrackColours[SCHEME_TRACK],
         trackSpritesSubmarineRideMiniHelicoptersQuarterTurn1Tile);
     track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height, 0, TUNNEL_0, 0, TUNNEL_0);
 
@@ -355,11 +297,7 @@ static void paint_mini_helicopters_track_left_quarter_turn_1_tile(
 
 /** rct2: 0x0081F418 */
 static void paint_mini_helicopters_track_right_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_mini_helicopters_track_left_quarter_turn_1_tile(
diff --git a/src/openrct2/ride/gentle/MonorailCycles.cpp b/src/openrct2/ride/gentle/MonorailCycles.cpp
index 1cabc35d44..a4ca28316e 100644
--- a/src/openrct2/ride/gentle/MonorailCycles.cpp
+++ b/src/openrct2/ride/gentle/MonorailCycles.cpp
@@ -135,72 +135,36 @@ static constexpr const uint32_t monorail_cycles_track_pieces_s_bend_right[2][4]
 };
 
 static constexpr const uint32_t monorail_cycles_track_pieces_flat_quarter_turn_3_tiles[4][3] = {
-    { SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_0,
-      SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_1,
+    { SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_1,
       SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_SW_SE_PART_2 },
-    { SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_0,
-      SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_1,
+    { SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_1,
       SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_NW_SW_PART_2 },
-    { SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_0,
-      SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_1,
+    { SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_0, SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_1,
       SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_NE_NW_PART_2 },
-    { SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_0,
-      SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_1,
+    { SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_0, SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_1,
       SPR_MONORAIL_CYCLES_FLAT_QUARTER_TURN_3_TILES_SE_NE_PART_2 }
 };
 
 static paint_struct* paint_monorail_cycles_util_7c(
-    paint_session* session,
-    bool flip,
-    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,
-    int16_t bound_box_offset_y,
-    int16_t bound_box_offset_z,
-    uint32_t rotation)
+    paint_session* session, bool flip, 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,
+    int16_t bound_box_offset_y, int16_t bound_box_offset_z, uint32_t rotation)
 {
     if (flip)
     {
         return sub_98197C(
-            session,
-            image_id,
-            y_offset,
-            x_offset,
-            bound_box_length_y,
-            bound_box_length_x,
-            bound_box_length_z,
-            z_offset,
-            bound_box_offset_y,
-            bound_box_offset_x,
-            bound_box_offset_z);
+            session, image_id, y_offset, x_offset, bound_box_length_y, bound_box_length_x, bound_box_length_z, z_offset,
+            bound_box_offset_y, bound_box_offset_x, bound_box_offset_z);
     }
 
     return sub_98197C(
-        session,
-        image_id,
-        x_offset,
-        y_offset,
-        bound_box_length_x,
-        bound_box_length_y,
-        bound_box_length_z,
-        z_offset,
-        bound_box_offset_x,
-        bound_box_offset_y,
-        bound_box_offset_z);
+        session, image_id, x_offset, y_offset, bound_box_length_x, bound_box_length_y, bound_box_length_z, z_offset,
+        bound_box_offset_x, bound_box_offset_y, bound_box_offset_z);
 }
 
 /** rct2: 0x0088AD48 */
 static void paint_monorail_cycles_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = monorail_cycles_track_pieces_flat[(direction & 1)] | session->TrackColours[SCHEME_TRACK];
@@ -217,11 +181,7 @@ static void paint_monorail_cycles_track_flat(
     }
 
     metal_a_supports_paint_setup(
-        session,
-        (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK,
-        4,
-        -1,
-        height,
+        session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 4, -1, height,
         session->TrackColours[SCHEME_SUPPORTS]);
 
     paint_util_set_segment_support_height(
@@ -231,11 +191,7 @@ static void paint_monorail_cycles_track_flat(
 
 /** rct2: 0x0088ADD8 */
 static void paint_monorail_cycles_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -273,20 +229,11 @@ static void paint_monorail_cycles_station(
 
 /** rct2: 0x0088AD88 */
 static void paint_monorail_cycles_track_left_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_left_quarter_turn_3_tiles_paint(
-        session,
-        3,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
+        session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
         monorail_cycles_track_pieces_flat_quarter_turn_3_tiles);
     track_paint_util_left_quarter_turn_3_tiles_tunnel(session, height, TUNNEL_0, direction, trackSequence);
 
@@ -315,11 +262,7 @@ static constexpr const uint8_t monorail_cycles_right_quarter_turn_3_tiles_to_lef
 
 /** rct2: 0x0088AD98 */
 static void paint_monorail_cycles_track_right_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = monorail_cycles_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence];
@@ -343,23 +286,12 @@ static constexpr const int8_t monorail_cycles_track_right_quarter_turn_5_tiles_s
 
 /** rct2: 0x0088ADB8 */
 static void paint_monorail_cycles_track_right_quarter_turn_5_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_right_quarter_turn_5_tiles_paint(
-        session,
-        1,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        monorail_cycles_track_pieces_flat_quarter_turn_5_tiles,
-        nullptr,
-        defaultRightQuarterTurn5TilesBoundLengths,
+        session, 1, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        monorail_cycles_track_pieces_flat_quarter_turn_5_tiles, nullptr, defaultRightQuarterTurn5TilesBoundLengths,
         defaultRightQuarterTurn5TilesBoundOffsets);
 
     int32_t supportHeight = height
@@ -369,88 +301,48 @@ static void paint_monorail_cycles_track_right_quarter_turn_5_tiles(
     {
         case 0:
             metal_a_supports_paint_setup(
-                session,
-                (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK,
-                4,
-                supportSpecial,
-                supportHeight,
+                session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 4, supportSpecial, supportHeight,
                 session->TrackColours[SCHEME_SUPPORTS]);
             break;
         case 2:
             if (direction == 0)
                 metal_a_supports_paint_setup(
-                    session,
-                    (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK,
-                    8,
-                    supportSpecial,
-                    supportHeight,
-                    session->TrackColours[SCHEME_SUPPORTS]);
+                    session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 8, supportSpecial,
+                    supportHeight, session->TrackColours[SCHEME_SUPPORTS]);
             if (direction == 1)
                 metal_a_supports_paint_setup(
-                    session,
-                    (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK,
-                    7,
-                    supportSpecial,
-                    supportHeight,
-                    session->TrackColours[SCHEME_SUPPORTS]);
+                    session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 7, supportSpecial,
+                    supportHeight, session->TrackColours[SCHEME_SUPPORTS]);
             if (direction == 2)
                 metal_a_supports_paint_setup(
-                    session,
-                    (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK,
-                    5,
-                    supportSpecial,
-                    supportHeight,
-                    session->TrackColours[SCHEME_SUPPORTS]);
+                    session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 5, supportSpecial,
+                    supportHeight, session->TrackColours[SCHEME_SUPPORTS]);
             if (direction == 3)
                 metal_a_supports_paint_setup(
-                    session,
-                    (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK,
-                    6,
-                    supportSpecial,
-                    supportHeight,
-                    session->TrackColours[SCHEME_SUPPORTS]);
+                    session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 6, supportSpecial,
+                    supportHeight, session->TrackColours[SCHEME_SUPPORTS]);
             break;
         case 5:
             if (direction == 0)
                 metal_a_supports_paint_setup(
-                    session,
-                    (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT,
-                    7,
-                    supportSpecial,
-                    supportHeight,
-                    session->TrackColours[SCHEME_SUPPORTS]);
+                    session, (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT, 7, supportSpecial,
+                    supportHeight, session->TrackColours[SCHEME_SUPPORTS]);
             if (direction == 1)
                 metal_a_supports_paint_setup(
-                    session,
-                    (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT,
-                    5,
-                    supportSpecial,
-                    supportHeight,
-                    session->TrackColours[SCHEME_SUPPORTS]);
+                    session, (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT, 5, supportSpecial,
+                    supportHeight, session->TrackColours[SCHEME_SUPPORTS]);
             if (direction == 2)
                 metal_a_supports_paint_setup(
-                    session,
-                    (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT,
-                    6,
-                    supportSpecial,
-                    supportHeight,
-                    session->TrackColours[SCHEME_SUPPORTS]);
+                    session, (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT, 6, supportSpecial,
+                    supportHeight, session->TrackColours[SCHEME_SUPPORTS]);
             if (direction == 3)
                 metal_a_supports_paint_setup(
-                    session,
-                    (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT,
-                    8,
-                    supportSpecial,
-                    supportHeight,
-                    session->TrackColours[SCHEME_SUPPORTS]);
+                    session, (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT, 8, supportSpecial,
+                    supportHeight, session->TrackColours[SCHEME_SUPPORTS]);
             break;
         case 6:
             metal_a_supports_paint_setup(
-                session,
-                (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT,
-                4,
-                supportSpecial,
-                supportHeight,
+                session, (direction & 1) ? METAL_SUPPORTS_STICK : METAL_SUPPORTS_STICK_ALT, 4, supportSpecial, supportHeight,
                 session->TrackColours[SCHEME_SUPPORTS]);
             break;
     }
@@ -486,8 +378,7 @@ static void paint_monorail_cycles_track_right_quarter_turn_5_tiles(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
@@ -498,8 +389,7 @@ static void paint_monorail_cycles_track_right_quarter_turn_5_tiles(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D4 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 6:
             paint_util_set_segment_support_height(
@@ -512,11 +402,7 @@ static void paint_monorail_cycles_track_right_quarter_turn_5_tiles(
 
 /** rct2: 0x0088ADA8 */
 static void paint_monorail_cycles_track_left_quarter_turn_5_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -526,11 +412,7 @@ static void paint_monorail_cycles_track_left_quarter_turn_5_tiles(
 
 /** rct2: 0x0088ADC8 */
 static void paint_monorail_cycles_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (direction == 2 || direction == 3)
@@ -611,9 +493,7 @@ static void paint_monorail_cycles_track_s_bend_left(
     {
         case 0:
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4, direction & 1),
-                0xFFFF,
+                session, paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4, direction & 1), 0xFFFF,
                 0);
             break;
         case 1:
@@ -621,22 +501,18 @@ static void paint_monorail_cycles_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B8 | SEGMENT_C8 | SEGMENT_B4, direction & 1),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 2:
             paint_util_set_segment_support_height(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_C0 | SEGMENT_D4 | SEGMENT_BC, direction & 1),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_C0, direction & 1),
-                0xFFFF,
+                session, paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_C0, direction & 1), 0xFFFF,
                 0);
             break;
     }
@@ -645,11 +521,7 @@ static void paint_monorail_cycles_track_s_bend_left(
 
 /** rct2: 0x*/
 static void paint_monorail_cycles_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (direction == 2 || direction == 3)
@@ -730,9 +602,7 @@ static void paint_monorail_cycles_track_s_bend_right(
     {
         case 0:
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC, direction & 1),
-                0xFFFF,
+                session, paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_BC, direction & 1), 0xFFFF,
                 0);
             break;
         case 1:
@@ -740,22 +610,18 @@ static void paint_monorail_cycles_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_C0 | SEGMENT_D4 | SEGMENT_BC, direction & 1),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 2:
             paint_util_set_segment_support_height(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B8 | SEGMENT_C8 | SEGMENT_B4, direction & 1),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B8, direction & 1),
-                0xFFFF,
+                session, paint_util_rotate_segments(SEGMENT_D0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B8, direction & 1), 0xFFFF,
                 0);
             break;
     }
diff --git a/src/openrct2/ride/gentle/ObservationTower.cpp b/src/openrct2/ride/gentle/ObservationTower.cpp
index 437c210e99..9ac578c033 100644
--- a/src/openrct2/ride/gentle/ObservationTower.cpp
+++ b/src/openrct2/ride/gentle/ObservationTower.cpp
@@ -28,12 +28,7 @@ enum
  *  rct2: 0x006D6258
  */
 void vehicle_visual_observation_tower(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     int32_t image_id;
@@ -80,11 +75,7 @@ void vehicle_visual_observation_tower(
 
 /** rct2: 0x0070DD6C */
 static void paint_observation_tower_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_3x3[direction][trackSequence];
@@ -99,14 +90,7 @@ static void paint_observation_tower_base(
     sub_98197C(session, imageId, 0, 0, 32, 32, 1, height, 0, 0, height);
 
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_TRACK],
-        height,
-        fenceSpritesMetalB,
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_TRACK], height, fenceSpritesMetalB,
         session->CurrentRotation);
 
     if (trackSequence == 0)
@@ -166,11 +150,7 @@ static void paint_observation_tower_base(
 
 /** rct2: 0x0070DD7C */
 static void paint_observation_tower_section(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence == 1)
diff --git a/src/openrct2/ride/gentle/SpaceRings.cpp b/src/openrct2/ride/gentle/SpaceRings.cpp
index d4a42a0ca6..29528c7488 100644
--- a/src/openrct2/ride/gentle/SpaceRings.cpp
+++ b/src/openrct2/ride/gentle/SpaceRings.cpp
@@ -84,11 +84,7 @@ static void paint_space_rings_structure(paint_session* session, Ride* ride, uint
 
 /** rct2: 0x00767C40 */
 static void paint_space_rings(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_3x3[direction][trackSequence];
@@ -119,15 +115,8 @@ static void paint_space_rings(
             break;
         default:
             track_paint_util_paint_fences(
-                session,
-                edges,
-                position,
-                tileElement,
-                ride,
-                session->TrackColours[SCHEME_MISC],
-                height,
-                space_rings_fence_sprites,
-                session->CurrentRotation);
+                session, edges, position, tileElement, ride, session->TrackColours[SCHEME_MISC], height,
+                space_rings_fence_sprites, session->CurrentRotation);
             break;
     }
 
diff --git a/src/openrct2/ride/gentle/SpiralSlide.cpp b/src/openrct2/ride/gentle/SpiralSlide.cpp
index cb6ba716dd..8b2be162d1 100644
--- a/src/openrct2/ride/gentle/SpiralSlide.cpp
+++ b/src/openrct2/ride/gentle/SpiralSlide.cpp
@@ -46,11 +46,7 @@ enum
 };
 
 static void spiral_slide_paint_tile_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t image_id = 0;
@@ -68,11 +64,7 @@ static void spiral_slide_paint_tile_right(
 }
 
 static void spiral_slide_paint_tile_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t image_id = 0;
@@ -90,11 +82,7 @@ static void spiral_slide_paint_tile_left(
 }
 
 static void spiral_slide_paint_tile_front(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t image_id = 0;
@@ -185,17 +173,8 @@ static void spiral_slide_paint_tile_front(
             image_id = (offset + slide_progress) | (ride->slide_peep_t_shirt_colour << 19) | (1 << 29);
 
             sub_98199C(
-                session,
-                image_id,
-                16,
-                16,
-                boundingBox.x,
-                boundingBox.y,
-                boundingBox.z,
-                height,
-                boundingBoxOffset.x,
-                boundingBoxOffset.y,
-                boundingBoxOffset.z);
+                session, image_id, 16, 16, boundingBox.x, boundingBox.y, boundingBox.z, height, boundingBoxOffset.x,
+                boundingBoxOffset.y, boundingBoxOffset.z);
         }
     }
 }
@@ -211,11 +190,7 @@ static constexpr const uint32_t spiral_slide_fence_sprites[] = {
  * rct: 0x007485C8
  */
 static void paint_spiral_slide(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_2x2[direction][trackSequence];
@@ -231,14 +206,7 @@ static void paint_spiral_slide(
     sub_98197C(session, imageId, 0, 0, 32, 32, 1, height, 0, 0, height);
 
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_TRACK],
-        height,
-        spiral_slide_fence_sprites,
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_TRACK], height, spiral_slide_fence_sprites,
         session->CurrentRotation);
 
     switch (trackSequence)
diff --git a/src/openrct2/ride/shops/Facility.cpp b/src/openrct2/ride/shops/Facility.cpp
index 78f03a2dc3..cbf313acba 100644
--- a/src/openrct2/ride/shops/Facility.cpp
+++ b/src/openrct2/ride/shops/Facility.cpp
@@ -23,11 +23,7 @@
  *  rct2: 0x007630DE
  */
 static void facility_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool hasSupports = wooden_a_supports_paint_setup(
@@ -60,16 +56,7 @@ static void facility_paint_setup(
         uint32_t foundationImageId = ((direction & 1) ? SPR_FLOOR_PLANKS_90_DEG : SPR_FLOOR_PLANKS)
             | session->TrackColours[SCHEME_3];
         sub_98197C(
-            session,
-            foundationImageId,
-            0,
-            0,
-            lengthX,
-            lengthY,
-            29,
-            height,
-            direction == 3 ? 28 : 2,
-            direction == 0 ? 28 : 2,
+            session, foundationImageId, 0, 0, lengthX, lengthY, 29, height, direction == 3 ? 28 : 2, direction == 0 ? 28 : 2,
             height);
 
         // Door image or base
diff --git a/src/openrct2/ride/shops/Shop.cpp b/src/openrct2/ride/shops/Shop.cpp
index 9ce236ee8d..fb6cf1f66f 100644
--- a/src/openrct2/ride/shops/Shop.cpp
+++ b/src/openrct2/ride/shops/Shop.cpp
@@ -23,11 +23,7 @@
  *  rct2: 0x007617A5
  */
 static void shop_paint_setup(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool hasSupports = wooden_a_supports_paint_setup(
diff --git a/src/openrct2/ride/thrill/3dCinema.cpp b/src/openrct2/ride/thrill/3dCinema.cpp
index 9d98b26133..9b5bbcd7f6 100644
--- a/src/openrct2/ride/thrill/3dCinema.cpp
+++ b/src/openrct2/ride/thrill/3dCinema.cpp
@@ -54,11 +54,7 @@ static void paint_3d_cinema_structure(
  * rct2: 0x0076574C
  */
 static void paint_3d_cinema(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_3x3[direction][trackSequence];
@@ -72,14 +68,7 @@ static void paint_3d_cinema(
     track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork);
 
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_MISC],
-        height,
-        fenceSpritesRope,
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_MISC], height, fenceSpritesRope,
         session->CurrentRotation);
 
     switch (trackSequence)
diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp
index 4222808e01..9b6bb64d5b 100644
--- a/src/openrct2/ride/thrill/Enterprise.cpp
+++ b/src/openrct2/ride/thrill/Enterprise.cpp
@@ -79,11 +79,7 @@ static void paint_enterprise_structure(
 
 /** rct2: 0x008A1584 */
 static void paint_enterprise(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_4x4[direction][trackSequence];
@@ -97,14 +93,7 @@ static void paint_enterprise(
     track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork);
 
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_TRACK],
-        height,
-        fenceSpritesRope,
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_TRACK], height, fenceSpritesRope,
         session->CurrentRotation);
 
     switch (trackSequence)
diff --git a/src/openrct2/ride/thrill/GoKarts.cpp b/src/openrct2/ride/thrill/GoKarts.cpp
index a52cd0105c..14ccce1b63 100644
--- a/src/openrct2/ride/thrill/GoKarts.cpp
+++ b/src/openrct2/ride/thrill/GoKarts.cpp
@@ -125,11 +125,7 @@ static constexpr const uint32_t go_karts_track_pieces_25_deg_up_to_flat[4][2] =
 
 /** rct2: 0x0074A748 */
 static void paint_go_karts_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -162,11 +158,7 @@ static void paint_go_karts_track_flat(
 
 /** rct2: 0x0074A758 */
 static void paint_go_karts_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -220,11 +212,7 @@ static void paint_go_karts_track_25_deg_up(
 
 /** rct2: 0x0074A768 */
 static void paint_go_karts_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -278,11 +266,7 @@ static void paint_go_karts_track_flat_to_25_deg_up(
 
 /** rct2: 0x */
 static void paint_go_karts_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -336,11 +320,7 @@ static void paint_go_karts_track_25_deg_up_to_flat(
 
 /** rct2: 0x0074A788 */
 static void paint_go_karts_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_go_karts_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -348,11 +328,7 @@ static void paint_go_karts_track_25_deg_down(
 
 /** rct2: 0x0074A798 */
 static void paint_go_karts_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_go_karts_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -360,11 +336,7 @@ static void paint_go_karts_track_flat_to_25_deg_down(
 
 /** rct2: 0x0074A7A8 */
 static void paint_go_karts_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_go_karts_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -372,11 +344,7 @@ static void paint_go_karts_track_25_deg_down_to_flat(
 
 /** rct2: 0x */
 static void paint_go_karts_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -487,11 +455,7 @@ static void paint_go_karts_station(
 
 /** rct2: 0x0074A7E8 */
 static void paint_go_karts_track_left_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -561,11 +525,7 @@ static void paint_go_karts_track_left_quarter_turn_1_tile(
 
 /** rct2: 0x0074A7F8 */
 static void paint_go_karts_track_right_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_go_karts_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement);
diff --git a/src/openrct2/ride/thrill/LaunchedFreefall.cpp b/src/openrct2/ride/thrill/LaunchedFreefall.cpp
index 8ecf03761d..8e38a79930 100644
--- a/src/openrct2/ride/thrill/LaunchedFreefall.cpp
+++ b/src/openrct2/ride/thrill/LaunchedFreefall.cpp
@@ -24,21 +24,15 @@ enum
     SPR_LAUNCHED_FREEFALL_TOWER_SEGMENT_TOP = 14566,
 };
 
-static constexpr const uint32_t launched_freefall_fence_sprites[] = {
-    SPR_FENCE_METAL_NE, SPR_FENCE_METAL_SE, SPR_FENCE_METAL_SW, SPR_FENCE_METAL_NW
-};
+static constexpr const uint32_t launched_freefall_fence_sprites[] = { SPR_FENCE_METAL_NE, SPR_FENCE_METAL_SE,
+                                                                      SPR_FENCE_METAL_SW, SPR_FENCE_METAL_NW };
 
 /**
  *
  *  rct2: 0x006D5FAB
  */
 void vehicle_visual_launched_freefall(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     int32_t image_id;
@@ -91,11 +85,7 @@ void vehicle_visual_launched_freefall(
 
 /** rct2: 0x006FD1F8 */
 static void paint_launched_freefall_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_3x3[direction][trackSequence];
@@ -110,15 +100,8 @@ static void paint_launched_freefall_base(
     sub_98197C(session, imageId, 0, 0, 32, 32, 1, height, 0, 0, height);
 
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_TRACK],
-        height,
-        launched_freefall_fence_sprites,
-        session->CurrentRotation);
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_TRACK], height,
+        launched_freefall_fence_sprites, session->CurrentRotation);
 
     if (trackSequence == 0)
     {
@@ -176,11 +159,7 @@ static void paint_launched_freefall_base(
 
 /** rct2: 0x006FD208 */
 static void paint_launched_freefall_tower_section(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence == 1)
diff --git a/src/openrct2/ride/thrill/MagicCarpet.cpp b/src/openrct2/ride/thrill/MagicCarpet.cpp
index d1d1ea1f56..3f2c21e792 100644
--- a/src/openrct2/ride/thrill/MagicCarpet.cpp
+++ b/src/openrct2/ride/thrill/MagicCarpet.cpp
@@ -68,11 +68,7 @@ static rct_vehicle* get_first_vehicle(Ride* ride)
 }
 
 static void paint_magic_carpet_frame(
-    paint_session* session,
-    uint8_t plane,
-    uint8_t direction,
-    LocationXYZ16 offset,
-    LocationXYZ16 bbOffset,
+    paint_session* session, uint8_t plane, uint8_t direction, LocationXYZ16 offset, LocationXYZ16 bbOffset,
     LocationXYZ16 bbSize)
 {
     uint32_t imageId;
@@ -88,43 +84,20 @@ static void paint_magic_carpet_frame(
     if (plane == PLANE_BACK)
     {
         sub_98197C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            bbSize.x,
-            bbSize.y,
-            127,
-            offset.z,
-            bbOffset.x,
-            bbOffset.y,
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, bbSize.x, bbSize.y, 127, offset.z, bbOffset.x, bbOffset.y,
             bbOffset.z);
     }
     else
     {
         sub_98199C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            bbSize.x,
-            bbSize.y,
-            127,
-            offset.z,
-            bbOffset.x,
-            bbOffset.y,
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, bbSize.x, bbSize.y, 127, offset.z, bbOffset.x, bbOffset.y,
             bbOffset.z);
     }
 }
 
 static void paint_magic_carpet_pendulum(
-    paint_session* session,
-    uint8_t plane,
-    uint32_t swingImageId,
-    uint8_t direction,
-    LocationXYZ16 offset,
-    LocationXYZ16 bbOffset,
-    LocationXYZ16 bbSize)
+    paint_session* session, uint8_t plane, uint32_t swingImageId, uint8_t direction, LocationXYZ16 offset,
+    LocationXYZ16 bbOffset, LocationXYZ16 bbSize)
 {
     uint32_t imageId = swingImageId;
     if (direction & 2)
@@ -141,26 +114,12 @@ static void paint_magic_carpet_pendulum(
     }
     imageId |= session->TrackColours[SCHEME_TRACK];
     sub_98199C(
-        session,
-        imageId,
-        (int8_t)offset.x,
-        (int8_t)offset.y,
-        bbSize.x,
-        bbSize.y,
-        127,
-        offset.z,
-        bbOffset.x,
-        bbOffset.y,
+        session, imageId, (int8_t)offset.x, (int8_t)offset.y, bbSize.x, bbSize.y, 127, offset.z, bbOffset.x, bbOffset.y,
         bbOffset.z);
 }
 
 static void paint_magic_carpet_vehicle(
-    paint_session* session,
-    Ride* ride,
-    uint8_t direction,
-    uint32_t swingImageId,
-    LocationXYZ16 offset,
-    LocationXYZ16 bbOffset,
+    paint_session* session, Ride* ride, uint8_t direction, uint32_t swingImageId, LocationXYZ16 offset, LocationXYZ16 bbOffset,
     LocationXYZ16 bbSize)
 {
     rct_ride_entry* rideEntry = get_ride_entry_by_ride(ride);
@@ -193,17 +152,8 @@ static void paint_magic_carpet_vehicle(
     offset.z += MagicCarpetOscillationZ[swingImageId];
 
     sub_98199C(
-        session,
-        vehicleImageId | imageColourFlags,
-        (int8_t)offset.x,
-        (int8_t)offset.y,
-        bbSize.x,
-        bbSize.y,
-        127,
-        offset.z,
-        bbOffset.x,
-        bbOffset.y,
-        bbOffset.z);
+        session, vehicleImageId | imageColourFlags, (int8_t)offset.x, (int8_t)offset.y, bbSize.x, bbSize.y, 127, offset.z,
+        bbOffset.x, bbOffset.y, bbOffset.z);
 
     // Riders
     rct_drawpixelinfo* dpi = session->DPI;
@@ -219,17 +169,8 @@ static void paint_magic_carpet_vehicle(
                 imageId |= (vehicle->peep_tshirt_colours[peepIndex + 0] << 19);
                 imageId |= (vehicle->peep_tshirt_colours[peepIndex + 1] << 24);
                 sub_98199C(
-                    session,
-                    imageId,
-                    (int8_t)offset.x,
-                    (int8_t)offset.y,
-                    bbSize.x,
-                    bbSize.y,
-                    127,
-                    offset.z,
-                    bbOffset.x,
-                    bbOffset.y,
-                    bbOffset.z);
+                    session, imageId, (int8_t)offset.x, (int8_t)offset.y, bbSize.x, bbSize.y, 127, offset.z, bbOffset.x,
+                    bbOffset.y, bbOffset.z);
             }
         }
     }
@@ -274,11 +215,7 @@ static void paint_magic_carpet_structure(
 
 /** rct2: 0x00898514 */
 static void paint_magic_carpet(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint8_t relativeTrackSequence = track_map_1x4[direction][trackSequence];
diff --git a/src/openrct2/ride/thrill/MotionSimulator.cpp b/src/openrct2/ride/thrill/MotionSimulator.cpp
index c85bafe1d5..2ebc2d1742 100644
--- a/src/openrct2/ride/thrill/MotionSimulator.cpp
+++ b/src/openrct2/ride/thrill/MotionSimulator.cpp
@@ -31,11 +31,7 @@ enum
  *  rct2: 0x0076522A
  */
 static void paint_motionsimulator_vehicle(
-    paint_session* session,
-    int8_t offsetX,
-    int8_t offsetY,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, int8_t offsetX, int8_t offsetY, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     Ride* ride = get_ride(track_element_get_ride_index(tileElement));
@@ -132,11 +128,7 @@ static void paint_motionsimulator_vehicle(
 
 /** rct2: 0x008A85C4 */
 static void paint_motionsimulator(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_2x2[direction][trackSequence];
@@ -148,14 +140,7 @@ static void paint_motionsimulator(
     wooden_a_supports_paint_setup(session, (direction & 1), 0, height, session->TrackColours[SCHEME_MISC], nullptr);
     track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork);
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_SUPPORTS],
-        height,
-        fenceSpritesRope,
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_SUPPORTS], height, fenceSpritesRope,
         session->CurrentRotation);
 
     switch (trackSequence)
diff --git a/src/openrct2/ride/thrill/PirateShip.cpp b/src/openrct2/ride/thrill/PirateShip.cpp
index 9df6826698..0acda9d179 100644
--- a/src/openrct2/ride/thrill/PirateShip.cpp
+++ b/src/openrct2/ride/thrill/PirateShip.cpp
@@ -108,30 +108,12 @@ static void paint_pirate_ship_structure(
 
     imageId = pirate_ship_frame_sprites[(direction & 1)][0] | session->TrackColours[SCHEME_TRACK];
     sub_98197C(
-        session,
-        imageId,
-        xOffset,
-        yOffset,
-        bounds.length_x,
-        bounds.length_y,
-        80,
-        height,
-        bounds.offset_x,
-        bounds.offset_y,
+        session, imageId, xOffset, yOffset, bounds.length_x, bounds.length_y, 80, height, bounds.offset_x, bounds.offset_y,
         height);
 
     imageId = baseImageId | imageColourFlags;
     sub_98199C(
-        session,
-        imageId,
-        xOffset,
-        yOffset,
-        bounds.length_x,
-        bounds.length_y,
-        80,
-        height,
-        bounds.offset_x,
-        bounds.offset_y,
+        session, imageId, xOffset, yOffset, bounds.length_x, bounds.length_y, 80, height, bounds.offset_x, bounds.offset_y,
         height);
 
     rct_drawpixelinfo* dpi = session->DPI;
@@ -152,17 +134,8 @@ static void paint_pirate_ship_structure(
                 vehicle->peep_tshirt_colours[peep], vehicle->peep_tshirt_colours[peep + 1]);
             imageId = (baseImageId + frameNum) | imageColourFlags;
             sub_98199C(
-                session,
-                imageId,
-                xOffset,
-                yOffset,
-                bounds.length_x,
-                bounds.length_y,
-                80,
-                height,
-                bounds.offset_x,
-                bounds.offset_y,
-                height);
+                session, imageId, xOffset, yOffset, bounds.length_x, bounds.length_y, 80, height, bounds.offset_x,
+                bounds.offset_y, height);
 
             peep += 2;
 
@@ -176,17 +149,8 @@ static void paint_pirate_ship_structure(
                 vehicle->peep_tshirt_colours[peep], vehicle->peep_tshirt_colours[peep + 1]);
             imageId = (baseImageId + frameNum) | imageColourFlags;
             sub_98199C(
-                session,
-                imageId,
-                xOffset,
-                yOffset,
-                bounds.length_x,
-                bounds.length_y,
-                80,
-                height,
-                bounds.offset_x,
-                bounds.offset_y,
-                height);
+                session, imageId, xOffset, yOffset, bounds.length_x, bounds.length_y, 80, height, bounds.offset_x,
+                bounds.offset_y, height);
 
             peep += 2;
             offset += 2;
@@ -195,16 +159,7 @@ static void paint_pirate_ship_structure(
 
     imageId = pirate_ship_frame_sprites[(direction & 1)][1] | session->TrackColours[SCHEME_TRACK];
     sub_98199C(
-        session,
-        imageId,
-        xOffset,
-        yOffset,
-        bounds.length_x,
-        bounds.length_y,
-        80,
-        height,
-        bounds.offset_x,
-        bounds.offset_y,
+        session, imageId, xOffset, yOffset, bounds.length_x, bounds.length_y, 80, height, bounds.offset_x, bounds.offset_y,
         height);
 
     session->CurrentlyDrawnItem = savedTileElement;
@@ -213,11 +168,7 @@ static void paint_pirate_ship_structure(
 
 /** rct2: 0x008A85C4 */
 static void paint_pirate_ship(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint8_t relativeTrackSequence = track_map_1x5[direction][trackSequence];
diff --git a/src/openrct2/ride/thrill/RotoDrop.cpp b/src/openrct2/ride/thrill/RotoDrop.cpp
index 9cd82d750d..a9c7a56049 100644
--- a/src/openrct2/ride/thrill/RotoDrop.cpp
+++ b/src/openrct2/ride/thrill/RotoDrop.cpp
@@ -32,12 +32,7 @@ enum
  *  rct2: 0x006D5DA9
  */
 void vehicle_visual_roto_drop(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     int32_t image_id;
@@ -92,11 +87,7 @@ void vehicle_visual_roto_drop(
 
 /** rct2: 0x00886194 */
 static void paint_roto_drop_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_3x3[direction][trackSequence];
@@ -111,14 +102,7 @@ static void paint_roto_drop_base(
     sub_98197C(session, imageId, 0, 0, 32, 32, 1, height, 0, 0, height);
 
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_TRACK],
-        height,
-        fenceSpritesMetalB,
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_TRACK], height, fenceSpritesMetalB,
         session->CurrentRotation);
 
     if (trackSequence == 0)
@@ -182,11 +166,7 @@ static void paint_roto_drop_base(
 
 /** rct2: 0x008861A4 */
 static void paint_roto_drop_tower_section(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence == 1)
diff --git a/src/openrct2/ride/thrill/SwingingInverterShip.cpp b/src/openrct2/ride/thrill/SwingingInverterShip.cpp
index 2ac5eefb9f..486f5a651b 100644
--- a/src/openrct2/ride/thrill/SwingingInverterShip.cpp
+++ b/src/openrct2/ride/thrill/SwingingInverterShip.cpp
@@ -100,56 +100,20 @@ static void paint_swinging_inverter_ship_structure(
     if (direction & 2)
     {
         sub_98197C(
-            session,
-            vehicleImageId,
-            xOffset,
-            yOffset,
-            boundBox.length_x,
-            boundBox.length_y,
-            127,
-            height,
-            boundBox.offset_x,
-            boundBox.offset_y,
-            height);
+            session, vehicleImageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x,
+            boundBox.offset_y, height);
         sub_98199C(
-            session,
-            frameImageId,
-            xOffset,
-            yOffset,
-            boundBox.length_x,
-            boundBox.length_y,
-            127,
-            height,
-            boundBox.offset_x,
-            boundBox.offset_y,
-            height);
+            session, frameImageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x,
+            boundBox.offset_y, height);
     }
     else
     {
         sub_98197C(
-            session,
-            frameImageId,
-            xOffset,
-            yOffset,
-            boundBox.length_x,
-            boundBox.length_y,
-            127,
-            height,
-            boundBox.offset_x,
-            boundBox.offset_y,
-            height);
+            session, frameImageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x,
+            boundBox.offset_y, height);
         sub_98199C(
-            session,
-            vehicleImageId,
-            xOffset,
-            yOffset,
-            boundBox.length_x,
-            boundBox.length_y,
-            127,
-            height,
-            boundBox.offset_x,
-            boundBox.offset_y,
-            height);
+            session, vehicleImageId, xOffset, yOffset, boundBox.length_x, boundBox.length_y, 127, height, boundBox.offset_x,
+            boundBox.offset_y, height);
     }
 
     session->CurrentlyDrawnItem = savedTileElement;
@@ -158,11 +122,7 @@ static void paint_swinging_inverter_ship_structure(
 
 /** rct2: 0x00760260 */
 static void paint_swinging_inverter_ship(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint8_t relativeTrackSequence = track_map_1x4[direction][trackSequence];
diff --git a/src/openrct2/ride/thrill/TopSpin.cpp b/src/openrct2/ride/thrill/TopSpin.cpp
index 014d8274ba..b1fe2ac079 100644
--- a/src/openrct2/ride/thrill/TopSpin.cpp
+++ b/src/openrct2/ride/thrill/TopSpin.cpp
@@ -41,12 +41,7 @@ static int8_t TopSpinSeatPositionOffset[] = {
  *  rct2: 0x0076750D
  */
 static void top_spin_paint_vehicle(
-    paint_session* session,
-    int8_t al,
-    int8_t cl,
-    uint8_t rideIndex,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, int8_t al, int8_t cl, uint8_t rideIndex, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint16_t boundBoxOffsetX, boundBoxOffsetY, boundBoxOffsetZ;
@@ -168,17 +163,8 @@ static void top_spin_paint_vehicle(
     }
 
     sub_98199C(
-        session,
-        image_id,
-        (int8_t)seatCoords.x,
-        (int8_t)seatCoords.y,
-        lengthX,
-        lengthY,
-        90,
-        seatCoords.z,
-        boundBoxOffsetX,
-        boundBoxOffsetY,
-        boundBoxOffsetZ);
+        session, image_id, (int8_t)seatCoords.x, (int8_t)seatCoords.y, lengthX, lengthY, 90, seatCoords.z, boundBoxOffsetX,
+        boundBoxOffsetY, boundBoxOffsetZ);
 
     rct_drawpixelinfo* dpi = session->DPI;
     if (dpi->zoom_level < 2 && vehicle != nullptr && vehicle->num_peeps != 0)
@@ -187,17 +173,8 @@ static void top_spin_paint_vehicle(
             | SPRITE_ID_PALETTE_COLOUR_2(vehicle->peep_tshirt_colours[0], vehicle->peep_tshirt_colours[1]);
 
         sub_98199C(
-            session,
-            image_id,
-            (int8_t)seatCoords.x,
-            (int8_t)seatCoords.y,
-            lengthX,
-            lengthY,
-            90,
-            seatCoords.z,
-            boundBoxOffsetX,
-            boundBoxOffsetY,
-            boundBoxOffsetZ);
+            session, image_id, (int8_t)seatCoords.x, (int8_t)seatCoords.y, lengthX, lengthY, 90, seatCoords.z, boundBoxOffsetX,
+            boundBoxOffsetY, boundBoxOffsetZ);
 
         if (vehicle->num_peeps > 2)
         {
@@ -205,17 +182,8 @@ static void top_spin_paint_vehicle(
                 | SPRITE_ID_PALETTE_COLOUR_2(vehicle->peep_tshirt_colours[2], vehicle->peep_tshirt_colours[3]);
 
             sub_98199C(
-                session,
-                image_id,
-                (int8_t)seatCoords.x,
-                (int8_t)seatCoords.y,
-                lengthX,
-                lengthY,
-                90,
-                seatCoords.z,
-                boundBoxOffsetX,
-                boundBoxOffsetY,
-                boundBoxOffsetZ);
+                session, image_id, (int8_t)seatCoords.x, (int8_t)seatCoords.y, lengthX, lengthY, 90, seatCoords.z,
+                boundBoxOffsetX, boundBoxOffsetY, boundBoxOffsetZ);
         }
 
         if (vehicle->num_peeps > 4)
@@ -224,17 +192,8 @@ static void top_spin_paint_vehicle(
                 | SPRITE_ID_PALETTE_COLOUR_2(vehicle->peep_tshirt_colours[4], vehicle->peep_tshirt_colours[5]);
 
             sub_98199C(
-                session,
-                image_id,
-                (int8_t)seatCoords.x,
-                (int8_t)seatCoords.y,
-                lengthX,
-                lengthY,
-                90,
-                seatCoords.z,
-                boundBoxOffsetX,
-                boundBoxOffsetY,
-                boundBoxOffsetZ);
+                session, image_id, (int8_t)seatCoords.x, (int8_t)seatCoords.y, lengthX, lengthY, 90, seatCoords.z,
+                boundBoxOffsetX, boundBoxOffsetY, boundBoxOffsetZ);
         }
 
         if (vehicle->num_peeps > 6)
@@ -243,17 +202,8 @@ static void top_spin_paint_vehicle(
                 | SPRITE_ID_PALETTE_COLOUR_2(vehicle->peep_tshirt_colours[6], vehicle->peep_tshirt_colours[7]);
 
             sub_98199C(
-                session,
-                image_id,
-                (int8_t)seatCoords.x,
-                (int8_t)seatCoords.y,
-                lengthX,
-                lengthY,
-                90,
-                seatCoords.z,
-                boundBoxOffsetX,
-                boundBoxOffsetY,
-                boundBoxOffsetZ);
+                session, image_id, (int8_t)seatCoords.x, (int8_t)seatCoords.y, lengthX, lengthY, 90, seatCoords.z,
+                boundBoxOffsetX, boundBoxOffsetY, boundBoxOffsetZ);
         }
     }
 
@@ -292,11 +242,7 @@ static void top_spin_paint_vehicle(
  * rct2: 0x0076679C
  */
 static void paint_top_spin(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_3x3[direction][trackSequence];
@@ -310,14 +256,7 @@ static void paint_top_spin(
     track_paint_util_paint_floor(session, edges, session->TrackColours[SCHEME_TRACK], height, floorSpritesCork);
 
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_MISC],
-        height,
-        fenceSpritesRope,
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_MISC], height, fenceSpritesRope,
         session->CurrentRotation);
 
     switch (trackSequence)
diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp
index d1837718b2..ff9105dc11 100644
--- a/src/openrct2/ride/thrill/Twist.cpp
+++ b/src/openrct2/ride/thrill/Twist.cpp
@@ -79,11 +79,7 @@ static void paint_twist_structure(
 
 /** rct2: 0x0076D858 */
 static void paint_twist(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_3x3[direction][trackSequence];
@@ -114,14 +110,7 @@ static void paint_twist(
             break;
         default:
             track_paint_util_paint_fences(
-                session,
-                edges,
-                position,
-                tileElement,
-                ride,
-                session->TrackColours[SCHEME_MISC],
-                height,
-                fenceSpritesRope,
+                session, edges, position, tileElement, ride, session->TrackColours[SCHEME_MISC], height, fenceSpritesRope,
                 session->CurrentRotation);
             break;
     }
diff --git a/src/openrct2/ride/transport/Chairlift.cpp b/src/openrct2/ride/transport/Chairlift.cpp
index 27063db21c..cde9ada930 100644
--- a/src/openrct2/ride/transport/Chairlift.cpp
+++ b/src/openrct2/ride/transport/Chairlift.cpp
@@ -68,10 +68,8 @@ enum
     SPR_CHAIRLIFT_STATION_END_CAP_NW,
 };
 
-const uint32_t chairlift_bullwheel_frames[] = { SPR_CHAIRLIFT_BULLWHEEL_FRAME_1,
-                                                SPR_CHAIRLIFT_BULLWHEEL_FRAME_2,
-                                                SPR_CHAIRLIFT_BULLWHEEL_FRAME_3,
-                                                SPR_CHAIRLIFT_BULLWHEEL_FRAME_4 };
+const uint32_t chairlift_bullwheel_frames[] = { SPR_CHAIRLIFT_BULLWHEEL_FRAME_1, SPR_CHAIRLIFT_BULLWHEEL_FRAME_2,
+                                                SPR_CHAIRLIFT_BULLWHEEL_FRAME_3, SPR_CHAIRLIFT_BULLWHEEL_FRAME_4 };
 
 static void chairlift_paint_util_draw_supports(paint_session* session, int32_t segments, uint16_t height)
 {
@@ -174,11 +172,7 @@ static bool chairlift_paint_util_is_last_track(
 }
 
 static void chairlift_paint_station_ne_sw(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const LocationXY16 pos = session->MapPosition;
@@ -269,11 +263,7 @@ static void chairlift_paint_station_ne_sw(
 }
 
 static void chairlift_paint_station_se_nw(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const LocationXY16 pos = session->MapPosition;
@@ -366,11 +356,7 @@ static void chairlift_paint_station_se_nw(
 
 /** rct2: 0x00744068 */
 static void chairlift_paint_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (direction % 2)
@@ -384,11 +370,7 @@ static void chairlift_paint_station(
 }
 
 static void chairlift_paint_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -411,11 +393,7 @@ static void chairlift_paint_flat(
 
 /** rct2: 0x00743FD8 */
 static void chairlift_paint_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -453,11 +431,7 @@ static void chairlift_paint_25_deg_up(
 
 /** rct2: 0x00743FD8 */
 static void chairlift_paint_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -512,11 +486,7 @@ static void chairlift_paint_flat_to_25_deg_up(
 
 /** rct2: 0x00743FF8 */
 static void chairlift_paint_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -571,11 +541,7 @@ static void chairlift_paint_25_deg_up_to_flat(
 
 /** rct2: 0x00744008 */
 static void chairlift_paint_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     chairlift_paint_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -583,11 +549,7 @@ static void chairlift_paint_25_deg_down(
 
 /** rct2: 0x00744018 */
 static void chairlift_paint_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     chairlift_paint_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -595,11 +557,7 @@ static void chairlift_paint_flat_to_25_deg_down(
 
 /** rct2: 0x00744028 */
 static void chairlift_paint_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     chairlift_paint_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -607,11 +565,7 @@ static void chairlift_paint_25_deg_down_to_flat(
 
 /** rct2: 0x00744038 */
 static void chairlift_paint_left_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -678,11 +632,7 @@ static void chairlift_paint_left_quarter_turn_1_tile(
 
 /** rct2: 0x00744048 */
 static void chairlift_paint_right_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     chairlift_paint_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement);
diff --git a/src/openrct2/ride/transport/Lift.cpp b/src/openrct2/ride/transport/Lift.cpp
index 1f60cda3f6..c173d17ec9 100644
--- a/src/openrct2/ride/transport/Lift.cpp
+++ b/src/openrct2/ride/transport/Lift.cpp
@@ -47,11 +47,7 @@ static void paint_lift_cage(paint_session* session, int8_t index, uint32_t colou
 
 /** rct2: 0x0076C6CC */
 static void paint_lift_base(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = track_map_3x3[direction][trackSequence];
@@ -84,14 +80,7 @@ static void paint_lift_base(
     sub_98197C(session, imageId, 0, 0, 32, 32, 1, height, 0, 0, height);
 
     track_paint_util_paint_fences(
-        session,
-        edges,
-        position,
-        tileElement,
-        ride,
-        session->TrackColours[SCHEME_TRACK],
-        height,
-        fenceSpritesMetalB,
+        session, edges, position, tileElement, ride, session->TrackColours[SCHEME_TRACK], height, fenceSpritesMetalB,
         session->CurrentRotation);
 
     int32_t blockedSegments = 0;
@@ -129,11 +118,7 @@ static void paint_lift_base(
 
 /** rct2: 0x0076C6DC */
 static void paint_lift_tower_section(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (trackSequence == 1)
diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp
index 15f9ae130c..9ab63f219b 100644
--- a/src/openrct2/ride/transport/MiniatureRailway.cpp
+++ b/src/openrct2/ride/transport/MiniatureRailway.cpp
@@ -134,9 +134,8 @@ enum
     SPR_MINIATURE_RAILWAY_DIAG_25_DEG_UP_S_N = 23452,
 };
 
-static constexpr const uint32_t miniature_railway_track_floor[4] = {
-    SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS_90_DEG, SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS_90_DEG
-};
+static constexpr const uint32_t miniature_railway_track_floor[4] = { SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS_90_DEG,
+                                                                     SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS_90_DEG };
 
 static constexpr const uint32_t miniature_railway_track_pieces_flat[4] = {
     SPR_MINIATURE_RAILWAY_FLAT_SW_NE,
@@ -145,9 +144,8 @@ static constexpr const uint32_t miniature_railway_track_pieces_flat[4] = {
     SPR_MINIATURE_RAILWAY_FLAT_NW_SE,
 };
 
-static constexpr const uint32_t miniature_railway_station_floor[4] = {
-    SPR_STATION_BASE_A_SW_NE, SPR_STATION_BASE_A_NW_SE, SPR_STATION_BASE_A_SW_NE, SPR_STATION_BASE_A_NW_SE
-};
+static constexpr const uint32_t miniature_railway_station_floor[4] = { SPR_STATION_BASE_A_SW_NE, SPR_STATION_BASE_A_NW_SE,
+                                                                       SPR_STATION_BASE_A_SW_NE, SPR_STATION_BASE_A_NW_SE };
 
 static constexpr const uint32_t miniature_railway_track_pieces_flat_station[4] = {
     SPR_MINIATURE_RAILWAY_FLAT_NO_BASE_SW_NE,
@@ -239,17 +237,13 @@ static constexpr const uint32_t miniature_railway_track_pieces_s_bend_right[2][4
 };
 
 static constexpr const uint32_t miniature_railway_track_pieces_flat_quarter_turn_3_tiles[4][3] = {
-    { SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_0,
-      SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_1,
+    { SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_1,
       SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SW_SE_PART_2 },
-    { SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_0,
-      SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_1,
+    { SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_1,
       SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NW_SW_PART_2 },
-    { SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_0,
-      SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_1,
+    { SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_0, SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_1,
       SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_NE_NW_PART_2 },
-    { SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_0,
-      SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_1,
+    { SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_0, SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_1,
       SPR_MINIATURE_RAILWAY_QUARTER_TURN_3_TILES_SE_NE_PART_2 }
 };
 
@@ -594,11 +588,7 @@ static uint32_t miniature_railway_track_to_grooved_indent(
 
 /** rct2: 0x008AD0C0 */
 static void paint_miniature_railway_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool paintAsGravel = false;
@@ -638,18 +628,9 @@ static void paint_miniature_railway_track_flat(
             imageIdAlt = miniature_railway_track_to_grooved_indent(
                 imageId, session->PathElementOnSameHeight, direction, session->CurrentRotation);
             sub_98199C_rotated(
-                session,
-                direction,
-                (imageIdAlt & 0x7FFFF) | IMAGE_TYPE_REMAP | IMAGE_TYPE_TRANSPARENT | (PALETTE_DARKEN_2 << 19),
-                0,
-                6,
-                32,
-                20,
-                2,
-                height,
-                0,
-                6,
-                height + 2);
+                session, direction,
+                (imageIdAlt & 0x7FFFF) | IMAGE_TYPE_REMAP | IMAGE_TYPE_TRANSPARENT | (PALETTE_DARKEN_2 << 19), 0, 6, 32, 20, 2,
+                height, 0, 6, height + 2);
         }
     }
     else
@@ -671,18 +652,9 @@ static void paint_miniature_railway_track_flat(
             imageIdAlt = miniature_railway_track_to_grooved_indent(
                 imageId, session->PathElementOnSameHeight, direction, session->CurrentRotation);
             sub_98197C_rotated(
-                session,
-                direction,
-                (imageIdAlt & 0x7FFFF) | IMAGE_TYPE_REMAP | IMAGE_TYPE_TRANSPARENT | (PALETTE_DARKEN_2 << 19),
-                0,
-                6,
-                32,
-                20,
-                2,
-                height,
-                0,
-                6,
-                height + 2);
+                session, direction,
+                (imageIdAlt & 0x7FFFF) | IMAGE_TYPE_REMAP | IMAGE_TYPE_TRANSPARENT | (PALETTE_DARKEN_2 << 19), 0, 6, 32, 20, 2,
+                height, 0, 6, height + 2);
         }
     }
 
@@ -694,11 +666,7 @@ static void paint_miniature_railway_track_flat(
 
 /** rct2: 0x008AD170, 0x008AD180, 0x008AD190 */
 static void paint_miniature_railway_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -722,11 +690,7 @@ static void paint_miniature_railway_station(
 
 /** rct2: 0x008AD0D0 */
 static void paint_miniature_railway_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = miniature_railway_track_pieces_25_deg_up[direction] | session->TrackColours[SCHEME_TRACK];
@@ -758,11 +722,7 @@ static void paint_miniature_railway_track_25_deg_up(
 
 /** rct2: 0x008AD0E0 */
 static void paint_miniature_railway_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = miniature_railway_track_pieces_flat_to_25_deg_up[direction] | session->TrackColours[SCHEME_TRACK];
@@ -794,11 +754,7 @@ static void paint_miniature_railway_track_flat_to_25_deg_up(
 
 /** rct2: 0x008AD0F0 */
 static void paint_miniature_railway_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = miniature_railway_track_pieces_25_deg_up_to_flat[direction] | session->TrackColours[SCHEME_TRACK];
@@ -830,11 +786,7 @@ static void paint_miniature_railway_track_25_deg_up_to_flat(
 
 /** rct2: 0x008AD100 */
 static void paint_miniature_railway_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_miniature_railway_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -842,11 +794,7 @@ static void paint_miniature_railway_track_25_deg_down(
 
 /** rct2: 0x008AD110 */
 static void paint_miniature_railway_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_miniature_railway_track_25_deg_up_to_flat(
@@ -855,11 +803,7 @@ static void paint_miniature_railway_track_flat_to_25_deg_down(
 
 /** rct2: 0x008AD120 */
 static void paint_miniature_railway_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_miniature_railway_track_flat_to_25_deg_up(
@@ -956,25 +900,13 @@ static constexpr const LocationXY16 miniature_railway_right_quarter_turn_5_tiles
 // clang-format on
 
 static constexpr const uint32_t miniature_railway_right_quarter_turn_5_tiles_track_floor[4][5] = {
-    { SPR_FLOOR_PLANKS,
-      SPR_FLOOR_PLANKS_S_SEGMENT,
-      SPR_FLOOR_PLANKS_N_SEGMENT,
-      SPR_FLOOR_PLANKS_S_SEGMENT,
+    { SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS_S_SEGMENT, SPR_FLOOR_PLANKS_N_SEGMENT, SPR_FLOOR_PLANKS_S_SEGMENT,
       SPR_FLOOR_PLANKS_90_DEG },
-    { SPR_FLOOR_PLANKS_90_DEG,
-      SPR_FLOOR_PLANKS_W_SEGMENT,
-      SPR_FLOOR_PLANKS_E_SEGMENT,
-      SPR_FLOOR_PLANKS_W_SEGMENT,
+    { SPR_FLOOR_PLANKS_90_DEG, SPR_FLOOR_PLANKS_W_SEGMENT, SPR_FLOOR_PLANKS_E_SEGMENT, SPR_FLOOR_PLANKS_W_SEGMENT,
       SPR_FLOOR_PLANKS },
-    { SPR_FLOOR_PLANKS,
-      SPR_FLOOR_PLANKS_N_SEGMENT,
-      SPR_FLOOR_PLANKS_S_SEGMENT,
-      SPR_FLOOR_PLANKS_N_SEGMENT,
+    { SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS_N_SEGMENT, SPR_FLOOR_PLANKS_S_SEGMENT, SPR_FLOOR_PLANKS_N_SEGMENT,
       SPR_FLOOR_PLANKS_90_DEG },
-    { SPR_FLOOR_PLANKS_90_DEG,
-      SPR_FLOOR_PLANKS_E_SEGMENT,
-      SPR_FLOOR_PLANKS_W_SEGMENT,
-      SPR_FLOOR_PLANKS_E_SEGMENT,
+    { SPR_FLOOR_PLANKS_90_DEG, SPR_FLOOR_PLANKS_E_SEGMENT, SPR_FLOOR_PLANKS_W_SEGMENT, SPR_FLOOR_PLANKS_E_SEGMENT,
       SPR_FLOOR_PLANKS },
 };
 
@@ -986,48 +918,27 @@ static constexpr const int8_t miniature_railway_right_quarter_turn_5_tiles_sprit
 
 /** rct2: 0x008AD140 */
 static void paint_miniature_railway_track_right_quarter_turn_5_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (right_quarter_turn_5_supports_type[direction][trackSequence] != -1)
     {
         bool isSupported = wooden_a_supports_paint_setup(
-            session,
-            right_quarter_turn_5_supports_type[direction][trackSequence],
-            0,
-            height,
-            session->TrackColours[SCHEME_SUPPORTS],
-            nullptr);
+            session, right_quarter_turn_5_supports_type[direction][trackSequence], 0, height,
+            session->TrackColours[SCHEME_SUPPORTS], nullptr);
 
         if (isSupported == false || (trackSequence == 3 && direction == 2))
         {
             track_paint_util_right_quarter_turn_5_tiles_paint(
-                session,
-                2,
-                height,
-                direction,
-                trackSequence,
-                session->TrackColours[SCHEME_TRACK],
-                miniature_railway_track_pieces_flat_quarter_turn_5_tiles,
-                miniature_railway_right_quarter_turn_5_tiles_offsets,
-                miniature_railway_right_quarter_turn_5_tiles_bound_lengths,
-                nullptr);
+                session, 2, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+                miniature_railway_track_pieces_flat_quarter_turn_5_tiles, miniature_railway_right_quarter_turn_5_tiles_offsets,
+                miniature_railway_right_quarter_turn_5_tiles_bound_lengths, nullptr);
         }
         else
         {
             track_paint_util_right_quarter_turn_5_tiles_paint(
-                session,
-                2,
-                height,
-                direction,
-                trackSequence,
-                session->TrackColours[SCHEME_SUPPORTS],
-                miniature_railway_right_quarter_turn_5_tiles_track_floor,
-                nullptr,
+                session, 2, height, direction, trackSequence, session->TrackColours[SCHEME_SUPPORTS],
+                miniature_railway_right_quarter_turn_5_tiles_track_floor, nullptr,
                 miniature_railway_right_quarter_turn_5_tiles_bound_lengths,
                 miniature_railway_right_quarter_turn_5_tiles_bound_offsets);
 
@@ -1039,17 +950,8 @@ static void paint_miniature_railway_track_right_quarter_turn_5_tiles(
             LocationXYZ16 boundsOffset = { offset.x, offset.y, 0 };
 
             sub_98199C(
-                session,
-                imageId,
-                (int8_t)offset.x,
-                (int8_t)offset.y,
-                boundsLength.x,
-                boundsLength.y,
-                2,
-                height,
-                boundsOffset.x,
-                boundsOffset.y,
-                height + boundsOffset.z);
+                session, imageId, (int8_t)offset.x, (int8_t)offset.y, boundsLength.x, boundsLength.y, 2, height, boundsOffset.x,
+                boundsOffset.y, height + boundsOffset.z);
         }
     }
     if (direction == 0 && trackSequence == 0)
@@ -1106,11 +1008,7 @@ static void paint_miniature_railway_track_right_quarter_turn_5_tiles(
 
 /** rct2: 0x008AD130 */
 static void paint_miniature_railway_track_left_quarter_turn_5_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1134,11 +1032,7 @@ static constexpr const uint32_t miniature_railway_s_bend_left_tiles_track_floor[
 
 /** rct2: 0x8AD150 */
 static void paint_miniature_railway_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (direction == 2 || direction == 3)
@@ -1147,11 +1041,7 @@ static void paint_miniature_railway_track_s_bend_left(
     }
 
     bool isSupported = wooden_a_supports_paint_setup(
-        session,
-        s_bend_left_supports_type[direction][trackSequence],
-        0,
-        height,
-        session->TrackColours[SCHEME_SUPPORTS],
+        session, s_bend_left_supports_type[direction][trackSequence], 0, height, session->TrackColours[SCHEME_SUPPORTS],
         nullptr);
 
     static constexpr const LocationXY16 offsetList[] = {
@@ -1176,17 +1066,7 @@ static void paint_miniature_railway_track_s_bend_left(
     if (isSupported == false)
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            bounds.x,
-            bounds.y,
-            2,
-            height,
-            offset.x,
-            offset.y,
+            session, direction, imageId, (int8_t)offset.x, (int8_t)offset.y, bounds.x, bounds.y, 2, height, offset.x, offset.y,
             height);
     }
     else
@@ -1198,17 +1078,7 @@ static void paint_miniature_railway_track_s_bend_left(
         imageId = miniature_railway_track_pieces_s_bend_left[direction & 1][trackSequence]
             | session->TrackColours[SCHEME_TRACK];
         sub_98199C_rotated(
-            session,
-            direction,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            bounds.x,
-            bounds.y,
-            2,
-            height,
-            offset.x,
-            offset.y,
+            session, direction, imageId, (int8_t)offset.x, (int8_t)offset.y, bounds.x, bounds.y, 2, height, offset.x, offset.y,
             height);
     }
     if (direction == 0 || direction == 2)
@@ -1263,11 +1133,7 @@ static constexpr const uint32_t miniature_railway_s_bend_right_tiles_track_floor
 
 /** rct2: 0x008AD160 */
 static void paint_miniature_railway_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (direction == 2 || direction == 3)
@@ -1276,11 +1142,7 @@ static void paint_miniature_railway_track_s_bend_right(
     }
 
     bool isSupported = wooden_a_supports_paint_setup(
-        session,
-        s_bend_right_supports_type[direction][trackSequence],
-        0,
-        height,
-        session->TrackColours[SCHEME_SUPPORTS],
+        session, s_bend_right_supports_type[direction][trackSequence], 0, height, session->TrackColours[SCHEME_SUPPORTS],
         nullptr);
 
     static constexpr const LocationXY16 offsetList[] = {
@@ -1304,17 +1166,7 @@ static void paint_miniature_railway_track_s_bend_right(
     if (isSupported == false)
     {
         sub_98197C_rotated(
-            session,
-            direction,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            bounds.x,
-            bounds.y,
-            2,
-            height,
-            offset.x,
-            offset.y,
+            session, direction, imageId, (int8_t)offset.x, (int8_t)offset.y, bounds.x, bounds.y, 2, height, offset.x, offset.y,
             height);
     }
     else
@@ -1326,17 +1178,7 @@ static void paint_miniature_railway_track_s_bend_right(
         imageId = miniature_railway_track_pieces_s_bend_right[direction & 1][trackSequence]
             | session->TrackColours[SCHEME_TRACK];
         sub_98199C_rotated(
-            session,
-            direction,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            bounds.x,
-            bounds.y,
-            2,
-            height,
-            offset.x,
-            offset.y,
+            session, direction, imageId, (int8_t)offset.x, (int8_t)offset.y, bounds.x, bounds.y, 2, height, offset.x, offset.y,
             height);
     }
 
@@ -1422,11 +1264,7 @@ static constexpr const LocationXYZ16 miniature_railway_right_quarter_turn_3_tile
 
 /** rct2: 0x008AD1B0 */
 static void paint_miniature_railway_track_right_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isSupported = false;
@@ -1439,16 +1277,9 @@ static void paint_miniature_railway_track_right_quarter_turn_3_tiles(
     if (isSupported == false)
     {
         track_paint_util_right_quarter_turn_3_tiles_paint(
-            session,
-            3,
-            height,
-            direction,
-            trackSequence,
-            session->TrackColours[SCHEME_TRACK],
-            miniature_railway_track_pieces_flat_quarter_turn_3_tiles,
-            defaultRightQuarterTurn3TilesOffsets,
-            defaultRightQuarterTurn3TilesBoundLengths,
-            nullptr);
+            session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+            miniature_railway_track_pieces_flat_quarter_turn_3_tiles, defaultRightQuarterTurn3TilesOffsets,
+            defaultRightQuarterTurn3TilesBoundLengths, nullptr);
 
         // The following piece was missing in vanilla RCT2
         if (trackSequence == 1 && direction == 0)
@@ -1460,15 +1291,8 @@ static void paint_miniature_railway_track_right_quarter_turn_3_tiles(
     else
     {
         track_paint_util_right_quarter_turn_3_tiles_paint(
-            session,
-            3,
-            height,
-            direction,
-            trackSequence,
-            session->TrackColours[SCHEME_SUPPORTS],
-            miniature_railway_right_quarter_turn_3_tile_track_floor,
-            nullptr,
-            defaultRightQuarterTurn3TilesBoundLengths,
+            session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_SUPPORTS],
+            miniature_railway_right_quarter_turn_3_tile_track_floor, nullptr, defaultRightQuarterTurn3TilesBoundLengths,
             miniature_railway_right_quarter_turn_3_tile_bound_offsets);
 
         static constexpr const int8_t right_quarter_turn_3_tiles_sprite_map[] = { 0, -1, 1, 2 };
@@ -1482,17 +1306,8 @@ static void paint_miniature_railway_track_right_quarter_turn_3_tiles(
         LocationXYZ16 boundsOffset = { offset.x, offset.y, 0 };
 
         sub_98199C(
-            session,
-            imageId,
-            (int8_t)offset.x,
-            (int8_t)offset.y,
-            boundsLength.x,
-            boundsLength.y,
-            3,
-            height,
-            boundsOffset.x,
-            boundsOffset.y,
-            height + boundsOffset.z);
+            session, imageId, (int8_t)offset.x, (int8_t)offset.y, boundsLength.x, boundsLength.y, 3, height, boundsOffset.x,
+            boundsOffset.y, height + boundsOffset.z);
     }
     track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_6);
 
@@ -1516,11 +1331,7 @@ static void paint_miniature_railway_track_right_quarter_turn_3_tiles(
 
 /** rct2: 0x008AD1A0 */
 static void paint_miniature_railway_track_left_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -1532,16 +1343,10 @@ static constexpr const int8_t paint_miniature_railway_eighth_to_diag_index[] = {
 
 static constexpr const uint32_t miniature_railway_floor_track_pieces_left_eight_to_diag[4][5] = {
     { SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS_E_SEGMENT, SPR_FLOOR_PLANKS_W_SEGMENT, SPR_FLOOR_PLANKS_90_DEG },
-    { SPR_FLOOR_PLANKS_90_DEG,
-      SPR_FLOOR_PLANKS_90_DEG,
-      SPR_FLOOR_PLANKS_S_SEGMENT,
-      SPR_FLOOR_PLANKS_N_SEGMENT,
+    { SPR_FLOOR_PLANKS_90_DEG, SPR_FLOOR_PLANKS_90_DEG, SPR_FLOOR_PLANKS_S_SEGMENT, SPR_FLOOR_PLANKS_N_SEGMENT,
       SPR_FLOOR_PLANKS },
     { SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS_W_SEGMENT, SPR_FLOOR_PLANKS_E_SEGMENT, SPR_FLOOR_PLANKS_90_DEG },
-    { SPR_FLOOR_PLANKS_90_DEG,
-      SPR_FLOOR_PLANKS_90_DEG,
-      SPR_FLOOR_PLANKS_N_SEGMENT,
-      SPR_FLOOR_PLANKS_S_SEGMENT,
+    { SPR_FLOOR_PLANKS_90_DEG, SPR_FLOOR_PLANKS_90_DEG, SPR_FLOOR_PLANKS_N_SEGMENT, SPR_FLOOR_PLANKS_S_SEGMENT,
       SPR_FLOOR_PLANKS },
 };
 
@@ -1609,11 +1414,7 @@ static constexpr const LocationXY16 miniature_railway_track_floor_pieces_left_ei
 
 /** rct2: 0x008AD1C0 */
 static void paint_miniature_railway_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const uint8_t supportType[4][5] = { { 0, 0, 3, 5, 1 }, { 1, 1, 4, 2, 0 }, { 0, 0, 5, 3, 1 }, { 1, 1, 2, 4, 0 } };
@@ -1676,21 +1477,12 @@ static void paint_miniature_railway_track_left_eighth_to_diag(
 }
 
 static constexpr const uint32_t miniature_railway_floor_track_pieces_right_eight_to_diag[4][5] = {
-    { SPR_FLOOR_PLANKS_90_DEG,
-      SPR_FLOOR_PLANKS_90_DEG,
-      SPR_FLOOR_PLANKS_N_SEGMENT,
-      SPR_FLOOR_PLANKS_S_SEGMENT,
+    { SPR_FLOOR_PLANKS_90_DEG, SPR_FLOOR_PLANKS_90_DEG, SPR_FLOOR_PLANKS_N_SEGMENT, SPR_FLOOR_PLANKS_S_SEGMENT,
       SPR_FLOOR_PLANKS_90_DEG },
-    { SPR_FLOOR_PLANKS_90_DEG,
-      SPR_FLOOR_PLANKS_90_DEG,
-      SPR_FLOOR_PLANKS_E_SEGMENT,
-      SPR_FLOOR_PLANKS_W_SEGMENT,
+    { SPR_FLOOR_PLANKS_90_DEG, SPR_FLOOR_PLANKS_90_DEG, SPR_FLOOR_PLANKS_E_SEGMENT, SPR_FLOOR_PLANKS_W_SEGMENT,
       SPR_FLOOR_PLANKS },
     { SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS, SPR_FLOOR_PLANKS_S_SEGMENT, SPR_FLOOR_PLANKS_N_SEGMENT, SPR_FLOOR_PLANKS_90_DEG },
-    { SPR_FLOOR_PLANKS_90_DEG,
-      SPR_FLOOR_PLANKS_90_DEG,
-      SPR_FLOOR_PLANKS_W_SEGMENT,
-      SPR_FLOOR_PLANKS_E_SEGMENT,
+    { SPR_FLOOR_PLANKS_90_DEG, SPR_FLOOR_PLANKS_90_DEG, SPR_FLOOR_PLANKS_W_SEGMENT, SPR_FLOOR_PLANKS_E_SEGMENT,
       SPR_FLOOR_PLANKS },
 };
 
@@ -1758,11 +1550,7 @@ static constexpr const LocationXY16 miniature_railway_track_floor_pieces_right_e
 
 /** rct2: 0x008AD1D0 */
 static void paint_miniature_railway_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const uint8_t supportType[4][5] = { { 0, 0, 2, 4, 1 }, { 1, 1, 3, 5, 0 }, { 0, 0, 4, 2, 1 }, { 1, 1, 5, 3, 0 } };
@@ -1829,11 +1617,7 @@ static void paint_miniature_railway_track_right_eighth_to_diag(
 
 /** rct2: 0x008AD1E0 */
 static void paint_miniature_railway_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -1843,11 +1627,7 @@ static void paint_miniature_railway_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008AD1F0 */
 static void paint_miniature_railway_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -1897,11 +1677,7 @@ static constexpr const floor_desc floors[] = {
 
 /** rct2: 0x008AD200 */
 static void miniature_railway_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isSupported = false;
@@ -1931,17 +1707,8 @@ static void miniature_railway_track_diag_flat(
     if (isSupported)
     {
         sub_98197C(
-            session,
-            floorImage | session->TrackColours[SCHEME_SUPPORTS],
-            0,
-            0,
-            floorBoundSize.x,
-            floorBoundSize.y,
-            (drawRail ? 2 : 0),
-            height,
-            floorBoundOffset.x,
-            floorBoundOffset.y,
-            height);
+            session, floorImage | session->TrackColours[SCHEME_SUPPORTS], 0, 0, floorBoundSize.x, floorBoundSize.y,
+            (drawRail ? 2 : 0), height, floorBoundOffset.x, floorBoundOffset.y, height);
         if (drawRail)
         {
             sub_98199C(session, imageId | session->TrackColours[SCHEME_TRACK], -16, -16, 32, 32, 2, height, -16, -16, height);
@@ -1963,12 +1730,7 @@ enum
 };
 
 static bool wooden_supports_paint_setup(
-    paint_session* session,
-    int32_t woodType,
-    int32_t supportType,
-    int32_t special,
-    int32_t height,
-    uint32_t imageColourFlags,
+    paint_session* session, int32_t woodType, int32_t supportType, int32_t special, int32_t height, uint32_t imageColourFlags,
     bool* underground)
 {
     switch (woodType)
@@ -1985,11 +1747,7 @@ static bool wooden_supports_paint_setup(
 
 /** rct2: 0x008AD230 */
 static void miniature_railway_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     // TODO: The supports are inconsistent for different rotations
@@ -2041,46 +1799,20 @@ static void miniature_railway_track_diag_25_deg_up(
     if (hasSupports)
     {
         sub_98197C(
-            session,
-            floorImage | session->TrackColours[SCHEME_SUPPORTS],
-            0,
-            0,
-            floorBoundSize.x,
-            floorBoundSize.y,
-            (drawRail ? 2 : 0),
-            height + offsetsB[direction][trackSequence][0],
-            floorBoundOffset.x,
-            floorBoundOffset.y,
+            session, floorImage | session->TrackColours[SCHEME_SUPPORTS], 0, 0, floorBoundSize.x, floorBoundSize.y,
+            (drawRail ? 2 : 0), height + offsetsB[direction][trackSequence][0], floorBoundOffset.x, floorBoundOffset.y,
             height + offsetsB[direction][trackSequence][1]);
         if (drawRail)
         {
             sub_98199C(
-                session,
-                imageId | session->TrackColours[SCHEME_TRACK],
-                -16,
-                -16,
-                32,
-                32,
-                2,
-                height,
-                -16,
-                -16,
+                session, imageId | session->TrackColours[SCHEME_TRACK], -16, -16, 32, 32, 2, height, -16, -16,
                 height + offsetB[direction]);
         }
     }
     else if (drawRail)
     {
         sub_98197C(
-            session,
-            imageId | session->TrackColours[SCHEME_TRACK],
-            -16,
-            -16,
-            32,
-            32,
-            2,
-            height,
-            -16,
-            -16,
+            session, imageId | session->TrackColours[SCHEME_TRACK], -16, -16, 32, 32, 2, height, -16, -16,
             height + offsetB[direction]);
     }
 
@@ -2090,11 +1822,7 @@ static void miniature_railway_track_diag_25_deg_up(
 
 /** rct2: 0x008AD210 */
 static void miniature_railway_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool hasSupports = false;
@@ -2124,17 +1852,8 @@ static void miniature_railway_track_diag_flat_to_25_deg_up(
     if (hasSupports)
     {
         sub_98197C(
-            session,
-            floorImage | session->TrackColours[SCHEME_SUPPORTS],
-            0,
-            0,
-            floorBoundSize.x,
-            floorBoundSize.y,
-            (drawRail ? 2 : 0),
-            height,
-            floorBoundOffset.x,
-            floorBoundOffset.y,
-            height);
+            session, floorImage | session->TrackColours[SCHEME_SUPPORTS], 0, 0, floorBoundSize.x, floorBoundSize.y,
+            (drawRail ? 2 : 0), height, floorBoundOffset.x, floorBoundOffset.y, height);
         if (drawRail)
         {
             sub_98199C(session, imageId | session->TrackColours[SCHEME_TRACK], -16, -16, 32, 32, 2, height, -16, -16, height);
@@ -2151,11 +1870,7 @@ static void miniature_railway_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008AD220 */
 static void miniature_railway_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const int8_t supportOffsets[][4] = {
@@ -2184,13 +1899,8 @@ static void miniature_railway_track_diag_25_deg_up_to_flat(
         floorBoundSize = floors[supportType].bound_size;
         floorBoundOffset = floors[supportType].bound_offset;
         hasSupports = wooden_supports_paint_setup(
-            session,
-            supportFunction,
-            supportType,
-            0,
-            height + supportOffsets[direction][trackSequence],
-            session->TrackColours[SCHEME_SUPPORTS],
-            nullptr);
+            session, supportFunction, supportType, 0, height + supportOffsets[direction][trackSequence],
+            session->TrackColours[SCHEME_SUPPORTS], nullptr);
     }
 
     if (direction == 1 && trackSequence == 3)
@@ -2213,46 +1923,20 @@ static void miniature_railway_track_diag_25_deg_up_to_flat(
     if (hasSupports)
     {
         sub_98197C(
-            session,
-            floorImage | session->TrackColours[SCHEME_SUPPORTS],
-            0,
-            0,
-            floorBoundSize.x,
-            floorBoundSize.y,
-            (drawRail ? 2 : 0),
-            height + offsetsB[direction][trackSequence][0],
-            floorBoundOffset.x,
-            floorBoundOffset.y,
+            session, floorImage | session->TrackColours[SCHEME_SUPPORTS], 0, 0, floorBoundSize.x, floorBoundSize.y,
+            (drawRail ? 2 : 0), height + offsetsB[direction][trackSequence][0], floorBoundOffset.x, floorBoundOffset.y,
             height + offsetsB[direction][trackSequence][1]);
         if (drawRail)
         {
             sub_98199C(
-                session,
-                imageId | session->TrackColours[SCHEME_TRACK],
-                -16,
-                -16,
-                32,
-                32,
-                2,
-                height,
-                -16,
-                -16,
+                session, imageId | session->TrackColours[SCHEME_TRACK], -16, -16, 32, 32, 2, height, -16, -16,
                 height + railOffsets[direction]);
         }
     }
     else if (drawRail)
     {
         sub_98197C(
-            session,
-            imageId | session->TrackColours[SCHEME_TRACK],
-            -16,
-            -16,
-            32,
-            32,
-            2,
-            height,
-            -16,
-            -16,
+            session, imageId | session->TrackColours[SCHEME_TRACK], -16, -16, 32, 32, 2, height, -16, -16,
             height + railOffsets[direction]);
     }
 
@@ -2262,11 +1946,7 @@ static void miniature_railway_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008AD260 */
 static void miniature_railway_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const int8_t supportOffsets[][4] = {
@@ -2295,13 +1975,8 @@ static void miniature_railway_track_diag_25_deg_down(
         floorBoundSize = floors[supportType].bound_size;
         floorBoundOffset = floors[supportType].bound_offset;
         hasSupports = wooden_supports_paint_setup(
-            session,
-            supportFunction,
-            supportType,
-            0,
-            height + supportOffsets[direction][trackSequence],
-            session->TrackColours[SCHEME_SUPPORTS],
-            nullptr);
+            session, supportFunction, supportType, 0, height + supportOffsets[direction][trackSequence],
+            session->TrackColours[SCHEME_SUPPORTS], nullptr);
     }
 
     if (direction == 1 && trackSequence == 3)
@@ -2323,46 +1998,20 @@ static void miniature_railway_track_diag_25_deg_down(
     if (hasSupports)
     {
         sub_98197C(
-            session,
-            floorImage | session->TrackColours[SCHEME_SUPPORTS],
-            0,
-            0,
-            floorBoundSize.x,
-            floorBoundSize.y,
-            (drawRail ? 2 : 0),
-            height + offsetsB[direction][trackSequence][0],
-            floorBoundOffset.x,
-            floorBoundOffset.y,
+            session, floorImage | session->TrackColours[SCHEME_SUPPORTS], 0, 0, floorBoundSize.x, floorBoundSize.y,
+            (drawRail ? 2 : 0), height + offsetsB[direction][trackSequence][0], floorBoundOffset.x, floorBoundOffset.y,
             height + offsetsB[direction][trackSequence][1]);
         if (drawRail)
         {
             sub_98199C(
-                session,
-                imageId | session->TrackColours[SCHEME_TRACK],
-                -16,
-                -16,
-                32,
-                32,
-                2,
-                height,
-                -16,
-                -16,
+                session, imageId | session->TrackColours[SCHEME_TRACK], -16, -16, 32, 32, 2, height, -16, -16,
                 height + railOffsets[direction]);
         }
     }
     else if (drawRail)
     {
         sub_98197C(
-            session,
-            imageId | session->TrackColours[SCHEME_TRACK],
-            -16,
-            -16,
-            32,
-            32,
-            2,
-            height,
-            -16,
-            -16,
+            session, imageId | session->TrackColours[SCHEME_TRACK], -16, -16, 32, 32, 2, height, -16, -16,
             height + railOffsets[direction]);
     }
 
@@ -2372,11 +2021,7 @@ static void miniature_railway_track_diag_25_deg_down(
 
 /** rct2: 0x008AD240 */
 static void miniature_railway_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const int8_t supportOffsets[][4] = {
@@ -2404,13 +2049,8 @@ static void miniature_railway_track_diag_flat_to_25_deg_down(
         floorBoundSize = floors[supportType].bound_size;
         floorBoundOffset = floors[supportType].bound_offset;
         hasSupports = wooden_supports_paint_setup(
-            session,
-            supportFunction,
-            supportType,
-            0,
-            height + supportOffsets[direction][trackSequence],
-            session->TrackColours[SCHEME_SUPPORTS],
-            nullptr);
+            session, supportFunction, supportType, 0, height + supportOffsets[direction][trackSequence],
+            session->TrackColours[SCHEME_SUPPORTS], nullptr);
     }
 
     if (direction == 1 && trackSequence == 3)
@@ -2432,46 +2072,20 @@ static void miniature_railway_track_diag_flat_to_25_deg_down(
     if (hasSupports)
     {
         sub_98197C(
-            session,
-            floorImage | session->TrackColours[SCHEME_SUPPORTS],
-            0,
-            0,
-            floorBoundSize.x,
-            floorBoundSize.y,
-            (drawRail ? 2 : 0),
-            height + offsetsB[direction][trackSequence][0],
-            floorBoundOffset.x,
-            floorBoundOffset.y,
+            session, floorImage | session->TrackColours[SCHEME_SUPPORTS], 0, 0, floorBoundSize.x, floorBoundSize.y,
+            (drawRail ? 2 : 0), height + offsetsB[direction][trackSequence][0], floorBoundOffset.x, floorBoundOffset.y,
             height + offsetsB[direction][trackSequence][1]);
         if (drawRail)
         {
             sub_98199C(
-                session,
-                imageId | session->TrackColours[SCHEME_TRACK],
-                -16,
-                -16,
-                32,
-                32,
-                2,
-                height,
-                -16,
-                -16,
+                session, imageId | session->TrackColours[SCHEME_TRACK], -16, -16, 32, 32, 2, height, -16, -16,
                 height + railOffsets[direction]);
         }
     }
     else if (drawRail)
     {
         sub_98197C(
-            session,
-            imageId | session->TrackColours[SCHEME_TRACK],
-            -16,
-            -16,
-            32,
-            32,
-            2,
-            height,
-            -16,
-            -16,
+            session, imageId | session->TrackColours[SCHEME_TRACK], -16, -16, 32, 32, 2, height, -16, -16,
             height + railOffsets[direction]);
     }
 
@@ -2480,11 +2094,7 @@ static void miniature_railway_track_diag_flat_to_25_deg_down(
 }
 
 static void miniature_railway_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool hasSupports = false;
@@ -2513,17 +2123,8 @@ static void miniature_railway_track_diag_25_deg_down_to_flat(
     if (hasSupports)
     {
         sub_98197C(
-            session,
-            floorImage | session->TrackColours[SCHEME_SUPPORTS],
-            0,
-            0,
-            floorBoundSize.x,
-            floorBoundSize.y,
-            (drawRail ? 2 : 0),
-            height,
-            floorBoundOffset.x,
-            floorBoundOffset.y,
-            height);
+            session, floorImage | session->TrackColours[SCHEME_SUPPORTS], 0, 0, floorBoundSize.x, floorBoundSize.y,
+            (drawRail ? 2 : 0), height, floorBoundOffset.x, floorBoundOffset.y, height);
         if (drawRail)
         {
             sub_98199C(session, imageId | session->TrackColours[SCHEME_TRACK], -16, -16, 32, 32, 2, height, -16, -16, height);
diff --git a/src/openrct2/ride/transport/Monorail.cpp b/src/openrct2/ride/transport/Monorail.cpp
index e7136b1b34..415003ecb6 100644
--- a/src/openrct2/ride/transport/Monorail.cpp
+++ b/src/openrct2/ride/transport/Monorail.cpp
@@ -217,17 +217,13 @@ static constexpr const uint32_t monorail_track_pieces_s_bend_right[2][4] = { {
                                                                              } };
 
 static constexpr const uint32_t monorail_track_pieces_flat_quarter_turn_3_tiles[4][3] = {
-    { SPR_MONORAIL_QUARTER_TURN_3_TILES_SW_SE_PART_0,
-      SPR_MONORAIL_QUARTER_TURN_3_TILES_SW_SE_PART_1,
+    { SPR_MONORAIL_QUARTER_TURN_3_TILES_SW_SE_PART_0, SPR_MONORAIL_QUARTER_TURN_3_TILES_SW_SE_PART_1,
       SPR_MONORAIL_QUARTER_TURN_3_TILES_SW_SE_PART_2 },
-    { SPR_MONORAIL_QUARTER_TURN_3_TILES_NW_SW_PART_0,
-      SPR_MONORAIL_QUARTER_TURN_3_TILES_NW_SW_PART_1,
+    { SPR_MONORAIL_QUARTER_TURN_3_TILES_NW_SW_PART_0, SPR_MONORAIL_QUARTER_TURN_3_TILES_NW_SW_PART_1,
       SPR_MONORAIL_QUARTER_TURN_3_TILES_NW_SW_PART_2 },
-    { SPR_MONORAIL_QUARTER_TURN_3_TILES_NE_NW_PART_0,
-      SPR_MONORAIL_QUARTER_TURN_3_TILES_NE_NW_PART_1,
+    { SPR_MONORAIL_QUARTER_TURN_3_TILES_NE_NW_PART_0, SPR_MONORAIL_QUARTER_TURN_3_TILES_NE_NW_PART_1,
       SPR_MONORAIL_QUARTER_TURN_3_TILES_NE_NW_PART_2 },
-    { SPR_MONORAIL_QUARTER_TURN_3_TILES_SE_NE_PART_0,
-      SPR_MONORAIL_QUARTER_TURN_3_TILES_SE_NE_PART_1,
+    { SPR_MONORAIL_QUARTER_TURN_3_TILES_SE_NE_PART_0, SPR_MONORAIL_QUARTER_TURN_3_TILES_SE_NE_PART_1,
       SPR_MONORAIL_QUARTER_TURN_3_TILES_SE_NE_PART_2 }
 };
 
@@ -423,11 +419,7 @@ static constexpr const uint32_t monorail_track_pieces_diag_25_deg_up[4] = {
 
 /** rct2: 0x008AE1AC */
 static void paint_monorail_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -464,11 +456,7 @@ static void paint_monorail_track_flat(
 
 /** rct2: 0x008AE25C, 0x008AE26C, 0x008AE27C */
 static void paint_monorail_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -522,11 +510,7 @@ static void paint_monorail_station(
 
 /** rct2: 0x008AE1BC */
 static void paint_monorail_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -570,11 +554,7 @@ static void paint_monorail_track_25_deg_up(
 
 /** rct2: 0x008AE1CC */
 static void paint_monorail_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -618,11 +598,7 @@ static void paint_monorail_track_flat_to_25_deg_up(
 
 /** rct2: 0x008AE1DC */
 static void paint_monorail_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -666,11 +642,7 @@ static void paint_monorail_track_25_deg_up_to_flat(
 
 /** rct2: 0x008AE1EC */
 static void paint_monorail_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_monorail_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -678,11 +650,7 @@ static void paint_monorail_track_25_deg_down(
 
 /** rct2: 0x008AE1FC */
 static void paint_monorail_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_monorail_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -690,11 +658,7 @@ static void paint_monorail_track_flat_to_25_deg_down(
 
 /** rct2: 0x008AE20C */
 static void paint_monorail_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_monorail_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -702,24 +666,13 @@ static void paint_monorail_track_25_deg_down_to_flat(
 
 /** rct2: 0x008AE22C */
 static void paint_monorail_track_right_quarter_turn_5_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_right_quarter_turn_5_tiles_paint(
-        session,
-        3,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        monorail_track_pieces_flat_quarter_turn_5_tiles,
-        defaultRightQuarterTurn5TilesOffsets,
-        defaultRightQuarterTurn5TilesBoundLengths,
-        nullptr);
+        session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        monorail_track_pieces_flat_quarter_turn_5_tiles, defaultRightQuarterTurn5TilesOffsets,
+        defaultRightQuarterTurn5TilesBoundLengths, nullptr);
 
     switch (trackSequence)
     {
@@ -776,11 +729,7 @@ static void paint_monorail_track_right_quarter_turn_5_tiles(
 
 /** rct2: 0x008AE21C */
 static void paint_monorail_track_left_quarter_turn_5_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -790,11 +739,7 @@ static void paint_monorail_track_left_quarter_turn_5_tiles(
 
 /** rct2: 0x */
 static void paint_monorail_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (direction == 2 || direction == 3)
@@ -898,11 +843,7 @@ static void paint_monorail_track_s_bend_left(
 
 /** rct2: 0x008AE24C */
 static void paint_monorail_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (direction == 2 || direction == 3)
@@ -1006,24 +947,13 @@ static void paint_monorail_track_s_bend_right(
 
 /** rct2: 0x008AE29C */
 static void paint_monorail_track_right_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_right_quarter_turn_3_tiles_paint(
-        session,
-        3,
-        height,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
-        monorail_track_pieces_flat_quarter_turn_3_tiles,
-        defaultRightQuarterTurn3TilesOffsets,
-        defaultRightQuarterTurn3TilesBoundLengths,
-        nullptr);
+        session, 3, height, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
+        monorail_track_pieces_flat_quarter_turn_3_tiles, defaultRightQuarterTurn3TilesOffsets,
+        defaultRightQuarterTurn3TilesBoundLengths, nullptr);
     track_paint_util_right_quarter_turn_3_tiles_tunnel(session, height, direction, trackSequence, TUNNEL_6);
 
     switch (trackSequence)
@@ -1054,11 +984,7 @@ static void paint_monorail_track_right_quarter_turn_3_tiles(
 
 /** rct2: 0x008AE28C */
 static void paint_monorail_track_left_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -1070,11 +996,7 @@ static constexpr const int8_t paint_monorail_eighth_to_diag_index[] = { 0, 1, 2,
 
 /** rct2: 0x008AE31C */
 static void paint_monorail_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     int8_t index = paint_monorail_eighth_to_diag_index[trackSequence];
@@ -1142,11 +1064,7 @@ static void paint_monorail_track_left_eighth_to_diag(
 
 /** rct2: 0x008AE32C */
 static void paint_monorail_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     int8_t index = paint_monorail_eighth_to_diag_index[trackSequence];
@@ -1214,11 +1132,7 @@ static void paint_monorail_track_right_eighth_to_diag(
 
 /** rct2: 0x008AE33C */
 static void paint_monorail_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const uint8_t map[] = { 4, 2, 3, 1, 0 };
@@ -1228,11 +1142,7 @@ static void paint_monorail_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x008AE34C */
 static void paint_monorail_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     const uint8_t map[] = { 4, 2, 3, 1, 0 };
@@ -1256,11 +1166,7 @@ static constexpr const int32_t monorail_diag_blocked_segments[] = { SEGMENT_C4 |
 
 /** rct2: 0x008AE2AC */
 static void paint_monorail_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (monorail_diag_image_segment[direction][trackSequence])
@@ -1272,11 +1178,7 @@ static void paint_monorail_track_diag_flat(
     if (trackSequence == 3)
     {
         metal_a_supports_paint_setup(
-            session,
-            METAL_SUPPORTS_BOXED,
-            monorail_diag_support_segment[direction],
-            0,
-            height,
+            session, METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 0, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -1287,11 +1189,7 @@ static void paint_monorail_track_diag_flat(
 
 /** rct2: 0x008AE2DC */
 static void paint_monorail_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (monorail_diag_image_segment[direction][trackSequence])
@@ -1303,11 +1201,7 @@ static void paint_monorail_track_diag_25_deg_up(
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            METAL_SUPPORTS_BOXED,
-            monorail_diag_support_segment[direction],
-            8,
-            height,
+            session, METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 8, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -1318,11 +1212,7 @@ static void paint_monorail_track_diag_25_deg_up(
 
 /** rct2: 0x008AE2BC */
 static void paint_monorail_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (monorail_diag_image_segment[direction][trackSequence])
@@ -1334,11 +1224,7 @@ static void paint_monorail_track_diag_flat_to_25_deg_up(
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            METAL_SUPPORTS_BOXED,
-            monorail_diag_support_segment[direction],
-            0,
-            height,
+            session, METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 0, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -1349,11 +1235,7 @@ static void paint_monorail_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x008AE2CC */
 static void paint_monorail_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (monorail_diag_image_segment[direction][trackSequence])
@@ -1365,11 +1247,7 @@ static void paint_monorail_track_diag_25_deg_up_to_flat(
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            METAL_SUPPORTS_BOXED,
-            monorail_diag_support_segment[direction],
-            4,
-            height,
+            session, METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 4, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -1380,11 +1258,7 @@ static void paint_monorail_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x008AE30C */
 static void paint_monorail_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (monorail_diag_image_segment[direction][trackSequence])
@@ -1396,11 +1270,7 @@ static void paint_monorail_track_diag_25_deg_down(
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            METAL_SUPPORTS_BOXED,
-            monorail_diag_support_segment[direction],
-            8,
-            height,
+            session, METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 8, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -1411,11 +1281,7 @@ static void paint_monorail_track_diag_25_deg_down(
 
 /** rct2: 0x008AE2EC */
 static void paint_monorail_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (monorail_diag_image_segment[direction][trackSequence])
@@ -1428,11 +1294,7 @@ static void paint_monorail_track_diag_flat_to_25_deg_down(
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            METAL_SUPPORTS_BOXED,
-            monorail_diag_support_segment[direction],
-            4,
-            height,
+            session, METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 4, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -1443,11 +1305,7 @@ static void paint_monorail_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x008AE2FC */
 static void paint_monorail_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     if (monorail_diag_image_segment[direction][trackSequence])
@@ -1460,11 +1318,7 @@ static void paint_monorail_track_diag_25_deg_down_to_flat(
     if (trackSequence == 3)
     {
         metal_b_supports_paint_setup(
-            session,
-            METAL_SUPPORTS_BOXED,
-            monorail_diag_support_segment[direction],
-            0,
-            height,
+            session, METAL_SUPPORTS_BOXED, monorail_diag_support_segment[direction], 0, height,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
diff --git a/src/openrct2/ride/transport/SuspendedMonorail.cpp b/src/openrct2/ride/transport/SuspendedMonorail.cpp
index 9186916460..9359979e9b 100644
--- a/src/openrct2/ride/transport/SuspendedMonorail.cpp
+++ b/src/openrct2/ride/transport/SuspendedMonorail.cpp
@@ -21,11 +21,7 @@
 
 /** rct2: 0x008636F4 */
 static void suspended_monorail_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -33,33 +29,13 @@ static void suspended_monorail_track_flat(
         case 0:
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25853,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 32,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25853, 0, 0, 32, 20, 3, height + 32, 0, 6,
                 height + 32);
             break;
         case 1:
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25854,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 32,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25854, 0, 0, 32, 20, 3, height + 32, 0, 6,
                 height + 32);
             break;
     }
@@ -77,11 +53,7 @@ static void suspended_monorail_track_flat(
 
 /** rct2: 0x008637A4, 0x008637B4, 0x008637C4 */
 static void suspended_monorail_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -94,30 +66,10 @@ static void suspended_monorail_track_station(
     sub_98197C_rotated(
         session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 28, 1, height, 0, 2, height);
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][1] | session->TrackColours[SCHEME_TRACK],
-        0,
-        0,
-        32,
-        20,
-        3,
-        height + 32,
-        0,
-        6,
+        session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 3, height + 32, 0, 6,
         height + 32);
     sub_98199C_rotated(
-        session,
-        direction,
-        imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS],
-        0,
-        6,
-        32,
-        20,
-        3,
-        height + 32,
-        0,
-        6,
+        session, direction, imageIds[direction][2] | session->TrackColours[SCHEME_SUPPORTS], 0, 6, 32, 20, 3, height + 32, 0, 6,
         height + 32);
     track_paint_util_draw_station_metal_supports_2(session, direction, height, session->TrackColours[SCHEME_SUPPORTS], 3);
     track_paint_util_draw_station_inverted(session, rideIndex, direction, height, tileElement, STATION_VARIANT_TALL);
@@ -128,73 +80,29 @@ static void suspended_monorail_track_station(
 
 /** rct2: 0x00863704 */
 static void suspended_monorail_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25945,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 32,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25945, 0, 0, 32, 20, 3, height + 32, 0, 6,
                 height + 48);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25946,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 32,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25946, 0, 0, 32, 20, 3, height + 32, 0, 6,
                 height + 48);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25947,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 32,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25947, 0, 0, 32, 20, 3, height + 32, 0, 6,
                 height + 48);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25948,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 32,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25948, 0, 0, 32, 20, 3, height + 32, 0, 6,
                 height + 48);
             break;
     }
@@ -237,73 +145,29 @@ static void suspended_monorail_track_25_deg_up(
 
 /** rct2: 0x00863714 */
 static void suspended_monorail_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25937,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 32,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25937, 0, 0, 32, 20, 3, height + 32, 0, 6,
                 height + 40);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25938,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 32,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25938, 0, 0, 32, 20, 3, height + 32, 0, 6,
                 height + 40);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25939,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 32,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25939, 0, 0, 32, 20, 3, height + 32, 0, 6,
                 height + 40);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25940,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 32,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25940, 0, 0, 32, 20, 3, height + 32, 0, 6,
                 height + 40);
             break;
     }
@@ -346,73 +210,29 @@ static void suspended_monorail_track_flat_to_25_deg_up(
 
 /** rct2: 0x00863724 */
 static void suspended_monorail_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
     {
         case 0:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25941,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 32,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25941, 0, 0, 32, 20, 3, height + 32, 0, 6,
                 height + 40);
             break;
         case 1:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25942,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 32,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25942, 0, 0, 32, 20, 3, height + 32, 0, 6,
                 height + 40);
             break;
         case 2:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25943,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 32,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25943, 0, 0, 32, 20, 3, height + 32, 0, 6,
                 height + 40);
             break;
         case 3:
             sub_98197C_rotated(
-                session,
-                direction,
-                session->TrackColours[SCHEME_TRACK] | 25944,
-                0,
-                0,
-                32,
-                20,
-                3,
-                height + 32,
-                0,
-                6,
+                session, direction, session->TrackColours[SCHEME_TRACK] | 25944, 0, 0, 32, 20, 3, height + 32, 0, 6,
                 height + 40);
             break;
     }
@@ -455,11 +275,7 @@ static void suspended_monorail_track_25_deg_up_to_flat(
 
 /** rct2: 0x00863734 */
 static void suspended_monorail_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     suspended_monorail_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -467,11 +283,7 @@ static void suspended_monorail_track_25_deg_down(
 
 /** rct2: 0x00863744 */
 static void suspended_monorail_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     suspended_monorail_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -479,11 +291,7 @@ static void suspended_monorail_track_flat_to_25_deg_down(
 
 /** rct2: 0x00863754 */
 static void suspended_monorail_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     suspended_monorail_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
@@ -491,11 +299,7 @@ static void suspended_monorail_track_25_deg_down_to_flat(
 
 /** rct2: 0x00863764 */
 static void suspended_monorail_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -505,71 +309,29 @@ static void suspended_monorail_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25876,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25876, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25881,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25881, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25886,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25886, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25871,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25871, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -595,32 +357,12 @@ static void suspended_monorail_track_left_quarter_turn_5(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25885,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25885, 0, 0, 32, 16, 3, height + 32, 0, 16,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25870,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25870, 0, 0, 32, 16, 3, height + 32, 0, 16,
                         height + 32);
                     break;
             }
@@ -628,8 +370,7 @@ static void suspended_monorail_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -637,47 +378,17 @@ static void suspended_monorail_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25874,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25874, 0, 0, 16, 16, 3, height + 32, 0, 16,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25879,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25879, 0, 0, 16, 16, 3, height + 32, 16, 16,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25884,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25884, 0, 0, 16, 16, 3, height + 32, 16, 0,
                         height + 32);
                     break;
                 case 3:
@@ -697,17 +408,7 @@ static void suspended_monorail_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25873,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 32,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25873, 0, 0, 16, 32, 3, height + 32, 16, 0,
                         height + 32);
                     break;
                 case 1:
@@ -720,17 +421,7 @@ static void suspended_monorail_track_left_quarter_turn_5(
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25868,
-                        0,
-                        0,
-                        16,
-                        32,
-                        3,
-                        height + 32,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25868, 0, 0, 16, 32, 3, height + 32, 16, 0,
                         height + 32);
                     break;
             }
@@ -738,8 +429,7 @@ static void suspended_monorail_track_left_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 6:
@@ -747,71 +437,29 @@ static void suspended_monorail_track_left_quarter_turn_5(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25872,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 32,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25872, 0, 0, 20, 32, 3, height + 32, 6, 0,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25877,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 32,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25877, 0, 0, 20, 32, 3, height + 32, 6, 0,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25882,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 32,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25882, 0, 0, 20, 32, 3, height + 32, 6, 0,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25867,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 32,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25867, 0, 0, 20, 32, 3, height + 32, 6, 0,
                         height + 32);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -831,11 +479,7 @@ static void suspended_monorail_track_left_quarter_turn_5(
 
 /** rct2: 0x00863774 */
 static void suspended_monorail_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -844,11 +488,7 @@ static void suspended_monorail_track_right_quarter_turn_5(
 
 /** rct2: 0x00863784 */
 static void suspended_monorail_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -858,62 +498,22 @@ static void suspended_monorail_track_s_bend_left(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25919,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25919, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25923,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25923, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25922,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25922, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25926,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25926, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
             }
@@ -942,32 +542,12 @@ static void suspended_monorail_track_s_bend_left(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25921,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25921, 0, 0, 32, 26, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25925,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25925, 0, 0, 32, 26, 3, height + 32, 0, 6,
                         height + 32);
                     break;
             }
@@ -976,8 +556,7 @@ static void suspended_monorail_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -997,32 +576,12 @@ static void suspended_monorail_track_s_bend_left(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25921,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25921, 0, 0, 32, 26, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25925,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25925, 0, 0, 32, 26, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 2:
@@ -1039,8 +598,7 @@ static void suspended_monorail_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 2:
@@ -1060,62 +618,22 @@ static void suspended_monorail_track_s_bend_left(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25922,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25922, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25926,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25926, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25919,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25919, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25923,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25923, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
             }
@@ -1141,11 +659,7 @@ static void suspended_monorail_track_s_bend_left(
 
 /** rct2: 0x00863794 */
 static void suspended_monorail_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1155,62 +669,22 @@ static void suspended_monorail_track_s_bend_right(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25927,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25927, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25931,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25931, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25930,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25930, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25934,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25934, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
             }
@@ -1231,32 +705,12 @@ static void suspended_monorail_track_s_bend_right(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25928,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25928, 0, 0, 32, 26, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25932,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25932, 0, 0, 32, 26, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 2:
@@ -1273,8 +727,7 @@ static void suspended_monorail_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -1302,32 +755,12 @@ static void suspended_monorail_track_s_bend_right(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25928,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25928, 0, 0, 32, 26, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25932,
-                        0,
-                        0,
-                        32,
-                        26,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25932, 0, 0, 32, 26, 3, height + 32, 0, 6,
                         height + 32);
                     break;
             }
@@ -1336,8 +769,7 @@ static void suspended_monorail_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 2:
@@ -1357,62 +789,22 @@ static void suspended_monorail_track_s_bend_right(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25930,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25930, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25934,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25934, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25927,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25927, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25931,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25931, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
             }
@@ -1438,11 +830,7 @@ static void suspended_monorail_track_s_bend_right(
 
 /** rct2: 0x008637D4 */
 static void suspended_monorail_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1452,71 +840,29 @@ static void suspended_monorail_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25860,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25860, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25863,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25863, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25866,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25866, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25857,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25857, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1534,17 +880,7 @@ static void suspended_monorail_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25859,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25859, 0, 0, 16, 16, 3, height + 32, 16, 0,
                         height + 32);
                     break;
                 case 1:
@@ -1553,32 +889,12 @@ static void suspended_monorail_track_left_quarter_turn_3(
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25865,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25865, 0, 0, 16, 16, 3, height + 32, 0, 16,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25856,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25856, 0, 0, 16, 16, 3, height + 32, 16, 16,
                         height + 32);
                     break;
             }
@@ -1591,71 +907,29 @@ static void suspended_monorail_track_left_quarter_turn_3(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25858,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 32,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25858, 0, 0, 20, 32, 3, height + 32, 6, 0,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25861,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 32,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25861, 0, 0, 20, 32, 3, height + 32, 6, 0,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25864,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 32,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25864, 0, 0, 20, 32, 3, height + 32, 6, 0,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25855,
-                        0,
-                        0,
-                        20,
-                        32,
-                        3,
-                        height + 32,
-                        6,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25855, 0, 0, 20, 32, 3, height + 32, 6, 0,
                         height + 32);
                     break;
             }
 
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             metal_a_supports_paint_setup(
                 session, METAL_SUPPORTS_BOXED, 4, 0, height + 42, session->TrackColours[SCHEME_SUPPORTS]);
 
@@ -1675,11 +949,7 @@ static void suspended_monorail_track_left_quarter_turn_3(
 
 /** rct2: 0x008637E4 */
 static void suspended_monorail_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -1688,11 +958,7 @@ static void suspended_monorail_track_right_quarter_turn_3(
 
 /** rct2: 0x00863864 */
 static void suspended_monorail_track_left_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -1702,62 +968,22 @@ static void suspended_monorail_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25903,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25903, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25907,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25907, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25911,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25911, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25915,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25915, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
             }
@@ -1778,62 +1004,22 @@ static void suspended_monorail_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25904,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25904, 0, 0, 32, 16, 3, height + 32, 0, 0,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25908,
-                        0,
-                        0,
-                        34,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25908, 0, 0, 34, 16, 3, height + 32, 0, 0,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25912,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25912, 0, 0, 32, 16, 3, height + 32, 0, 16,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25916,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25916, 0, 0, 32, 16, 3, height + 32, 0, 16,
                         height + 32);
                     break;
             }
@@ -1841,8 +1027,7 @@ static void suspended_monorail_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -1850,70 +1035,28 @@ static void suspended_monorail_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25905,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25905, 0, 0, 16, 16, 3, height + 32, 0, 16,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25909,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25909, 0, 0, 16, 16, 3, height + 32, 16, 16,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25913,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25913, 0, 0, 16, 16, 3, height + 32, 16, 0,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25917,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25917, 0, 0, 16, 16, 3, height + 32, 0, 0,
                         height + 32);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D4, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -1926,62 +1069,22 @@ static void suspended_monorail_track_left_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25906,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25906, 0, 0, 16, 16, 3, height + 32, 16, 16,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25910,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height + 32,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25910, 0, 0, 16, 18, 3, height + 32, 0, 16,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25914,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25914, 0, 0, 16, 16, 3, height + 32, 0, 0,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25918,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25918, 0, 0, 16, 16, 3, height + 32, 16, 0,
                         height + 32);
                     break;
             }
@@ -1990,8 +1093,7 @@ static void suspended_monorail_track_left_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C0 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -2019,11 +1121,7 @@ static void suspended_monorail_track_left_eighth_to_diag(
 
 /** rct2: 0x00863874 */
 static void suspended_monorail_track_right_eighth_to_diag(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2033,62 +1131,22 @@ static void suspended_monorail_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25887,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25887, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25891,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25891, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25895,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25895, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25899,
-                        0,
-                        0,
-                        32,
-                        20,
-                        3,
-                        height + 32,
-                        0,
-                        6,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25899, 0, 0, 32, 20, 3, height + 32, 0, 6,
                         height + 32);
                     break;
             }
@@ -2109,62 +1167,22 @@ static void suspended_monorail_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25888,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25888, 0, 0, 32, 16, 3, height + 32, 0, 16,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25892,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25892, 0, 0, 32, 16, 3, height + 32, 0, 16,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25896,
-                        0,
-                        0,
-                        34,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25896, 0, 0, 34, 16, 3, height + 32, 0, 0,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25900,
-                        0,
-                        0,
-                        32,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25900, 0, 0, 32, 16, 3, height + 32, 0, 0,
                         height + 32);
                     break;
             }
@@ -2172,8 +1190,7 @@ static void suspended_monorail_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 2:
@@ -2181,70 +1198,28 @@ static void suspended_monorail_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25889,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25889, 0, 0, 16, 16, 3, height + 32, 0, 0,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25893,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25893, 0, 0, 16, 16, 3, height + 32, 16, 0,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25897,
-                        0,
-                        0,
-                        28,
-                        28,
-                        3,
-                        height + 32,
-                        4,
-                        4,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25897, 0, 0, 28, 28, 3, height + 32, 4, 4,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25901,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25901, 0, 0, 16, 16, 3, height + 32, 0, 16,
                         height + 32);
                     break;
             }
             paint_util_set_segment_support_height(
-                session,
-                paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                session, paint_util_rotate_segments(SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC, direction),
+                0xFFFF, 0);
             paint_util_set_general_support_height(session, height + 48, 0x20);
             break;
         case 3:
@@ -2257,62 +1232,22 @@ static void suspended_monorail_track_right_eighth_to_diag(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25890,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        16,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25890, 0, 0, 16, 16, 3, height + 32, 16, 0,
                         height + 32);
                     break;
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25894,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        0,
-                        0,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25894, 0, 0, 16, 16, 3, height + 32, 0, 0,
                         height + 32);
                     break;
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25898,
-                        0,
-                        0,
-                        16,
-                        18,
-                        3,
-                        height + 32,
-                        0,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25898, 0, 0, 16, 18, 3, height + 32, 0, 16,
                         height + 32);
                     break;
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25902,
-                        0,
-                        0,
-                        16,
-                        16,
-                        3,
-                        height + 32,
-                        16,
-                        16,
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25902, 0, 0, 16, 16, 3, height + 32, 16, 16,
                         height + 32);
                     break;
             }
@@ -2321,8 +1256,7 @@ static void suspended_monorail_track_right_eighth_to_diag(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             switch (direction)
             {
                 case 0:
@@ -2350,11 +1284,7 @@ static void suspended_monorail_track_right_eighth_to_diag(
 
 /** rct2: 0x00863884 */
 static void suspended_monorail_track_left_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -2363,11 +1293,7 @@ static void suspended_monorail_track_left_eighth_to_orthogonal(
 
 /** rct2: 0x00863894 */
 static void suspended_monorail_track_right_eighth_to_orthogonal(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftEighthTurnToOrthogonal[trackSequence];
@@ -2376,11 +1302,7 @@ static void suspended_monorail_track_right_eighth_to_orthogonal(
 
 /** rct2: 0x008637F4 */
 static void suspended_monorail_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2390,18 +1312,8 @@ static void suspended_monorail_track_diag_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25936,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 32);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25936, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 32);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2413,18 +1325,8 @@ static void suspended_monorail_track_diag_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25935,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 32);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25935, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 32);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2436,18 +1338,8 @@ static void suspended_monorail_track_diag_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25935,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 32);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25935, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 32);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2459,18 +1351,8 @@ static void suspended_monorail_track_diag_flat(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25936,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 32);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25936, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 32);
                     break;
             }
 
@@ -2503,11 +1385,7 @@ static void suspended_monorail_track_diag_flat(
 
 /** rct2: 0x00863824 */
 static void suspended_monorail_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2517,18 +1395,8 @@ static void suspended_monorail_track_diag_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25960,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 48);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25960, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 48);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2540,18 +1408,8 @@ static void suspended_monorail_track_diag_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25957,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 48);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25957, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 48);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2563,18 +1421,8 @@ static void suspended_monorail_track_diag_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25959,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 48);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25959, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 48);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2586,18 +1434,8 @@ static void suspended_monorail_track_diag_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25958,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 48);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25958, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 48);
                     break;
             }
 
@@ -2630,11 +1468,7 @@ static void suspended_monorail_track_diag_25_deg_up(
 
 /** rct2: 0x00863804 */
 static void suspended_monorail_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2644,18 +1478,8 @@ static void suspended_monorail_track_diag_flat_to_25_deg_up(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25952,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25952, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2667,18 +1491,8 @@ static void suspended_monorail_track_diag_flat_to_25_deg_up(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25949,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25949, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2690,18 +1504,8 @@ static void suspended_monorail_track_diag_flat_to_25_deg_up(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25951,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25951, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2713,18 +1517,8 @@ static void suspended_monorail_track_diag_flat_to_25_deg_up(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25950,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25950, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
 
@@ -2757,11 +1551,7 @@ static void suspended_monorail_track_diag_flat_to_25_deg_up(
 
 /** rct2: 0x00863814 */
 static void suspended_monorail_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2771,18 +1561,8 @@ static void suspended_monorail_track_diag_25_deg_up_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25956,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25956, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2794,18 +1574,8 @@ static void suspended_monorail_track_diag_25_deg_up_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25953,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25953, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2817,18 +1587,8 @@ static void suspended_monorail_track_diag_25_deg_up_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25955,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25955, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2840,18 +1600,8 @@ static void suspended_monorail_track_diag_25_deg_up_to_flat(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25954,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25954, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
 
@@ -2884,11 +1634,7 @@ static void suspended_monorail_track_diag_25_deg_up_to_flat(
 
 /** rct2: 0x00863854 */
 static void suspended_monorail_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -2898,18 +1644,8 @@ static void suspended_monorail_track_diag_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25958,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 48);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25958, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 48);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2921,18 +1657,8 @@ static void suspended_monorail_track_diag_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25959,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 48);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25959, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 48);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2944,18 +1670,8 @@ static void suspended_monorail_track_diag_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25957,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 48);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25957, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 48);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -2967,18 +1683,8 @@ static void suspended_monorail_track_diag_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25960,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 48);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25960, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 48);
                     break;
             }
 
@@ -3011,11 +1717,7 @@ static void suspended_monorail_track_diag_25_deg_down(
 
 /** rct2: 0x00863834 */
 static void suspended_monorail_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3025,18 +1727,8 @@ static void suspended_monorail_track_diag_flat_to_25_deg_down(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25954,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25954, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -3047,18 +1739,8 @@ static void suspended_monorail_track_diag_flat_to_25_deg_down(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25955,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25955, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -3069,18 +1751,8 @@ static void suspended_monorail_track_diag_flat_to_25_deg_down(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25953,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25953, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -3091,18 +1763,8 @@ static void suspended_monorail_track_diag_flat_to_25_deg_down(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25956,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25956, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
 
@@ -3135,11 +1797,7 @@ static void suspended_monorail_track_diag_flat_to_25_deg_down(
 
 /** rct2: 0x00863844 */
 static void suspended_monorail_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (trackSequence)
@@ -3149,18 +1807,8 @@ static void suspended_monorail_track_diag_25_deg_down_to_flat(
             {
                 case 3:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25950,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25950, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -3172,18 +1820,8 @@ static void suspended_monorail_track_diag_25_deg_down_to_flat(
             {
                 case 0:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25951,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25951, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -3195,18 +1833,8 @@ static void suspended_monorail_track_diag_25_deg_down_to_flat(
             {
                 case 2:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25949,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25949, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
             paint_util_set_segment_support_height(
@@ -3218,18 +1846,8 @@ static void suspended_monorail_track_diag_25_deg_down_to_flat(
             {
                 case 1:
                     sub_98197C_rotated(
-                        session,
-                        direction,
-                        session->TrackColours[SCHEME_TRACK] | 25952,
-                        -16,
-                        -16,
-                        32,
-                        32,
-                        3,
-                        height + 32,
-                        -16,
-                        -16,
-                        height + 40);
+                        session, direction, session->TrackColours[SCHEME_TRACK] | 25952, -16, -16, 32, 32, 3, height + 32, -16,
+                        -16, height + 40);
                     break;
             }
 
diff --git a/src/openrct2/ride/water/BoatHire.cpp b/src/openrct2/ride/water/BoatHire.cpp
index 4030306d25..2e7211a444 100644
--- a/src/openrct2/ride/water/BoatHire.cpp
+++ b/src/openrct2/ride/water/BoatHire.cpp
@@ -31,11 +31,7 @@ enum
 
 /** rct2: 0x008B0E40 */
 static void paint_boat_hire_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -64,11 +60,7 @@ static void paint_boat_hire_track_flat(
 
 /** rct2: 0x008B0E50 */
 static void paint_boat_hire_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -94,11 +86,7 @@ static void paint_boat_hire_station(
 
 /** rct2: 0x008B0E80 */
 static void paint_boat_hire_track_left_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -141,11 +129,7 @@ static void paint_boat_hire_track_left_quarter_turn_1_tile(
 
 /** rct2: 0x008B0E90 */
 static void paint_boat_hire_track_right_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_boat_hire_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement);
diff --git a/src/openrct2/ride/water/DingySlide.cpp b/src/openrct2/ride/water/DingySlide.cpp
index b03d3cfc17..a5420153fb 100644
--- a/src/openrct2/ride/water/DingySlide.cpp
+++ b/src/openrct2/ride/water/DingySlide.cpp
@@ -350,11 +350,7 @@ enum
 };
 
 static void dinghy_slide_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4][2] = {
@@ -392,11 +388,7 @@ static void dinghy_slide_track_flat(
 }
 
 static void dinghy_slide_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -407,17 +399,7 @@ static void dinghy_slide_track_station(
     };
 
     sub_98197C_rotated(
-        session,
-        direction,
-        imageIds[direction][0] | session->TrackColours[SCHEME_TRACK],
-        0,
-        0,
-        32,
-        20,
-        1,
-        height,
-        0,
-        6,
+        session, direction, imageIds[direction][0] | session->TrackColours[SCHEME_TRACK], 0, 0, 32, 20, 1, height, 0, 6,
         height + 3);
     sub_98196C_rotated(
         session, direction, imageIds[direction][1] | session->TrackColours[SCHEME_MISC], 0, 0, 32, 32, 1, height);
@@ -436,11 +418,7 @@ static void dinghy_slide_track_station(
 }
 
 static void dinghy_slide_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4][2] = {
@@ -485,11 +463,7 @@ static void dinghy_slide_track_25_deg_up(
 }
 
 static void dinghy_slide_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -525,11 +499,7 @@ static void dinghy_slide_track_60_deg_up(
 }
 
 static void dinghy_slide_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4][2] = {
@@ -574,11 +544,7 @@ static void dinghy_slide_track_flat_to_25_deg_up(
 }
 
 static void dinghy_slide_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -614,11 +580,7 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up(
 }
 
 static void dinghy_slide_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -654,11 +616,7 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up(
 }
 
 static void dinghy_slide_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[2][4][2] = {
@@ -703,66 +661,42 @@ static void dinghy_slide_track_25_deg_up_to_flat(
 }
 
 static void dinghy_slide_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     dinghy_slide_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void dinghy_slide_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     dinghy_slide_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void dinghy_slide_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     dinghy_slide_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void dinghy_slide_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     dinghy_slide_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void dinghy_slide_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     dinghy_slide_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void dinghy_slide_track_right_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const sprite_bb imageIds[4][5] = {
@@ -867,8 +801,7 @@ static void dinghy_slide_track_right_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
@@ -879,8 +812,7 @@ static void dinghy_slide_track_right_quarter_turn_5(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D4 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 6:
             paint_util_set_segment_support_height(
@@ -892,11 +824,7 @@ static void dinghy_slide_track_right_quarter_turn_5(
 }
 
 static void dinghy_slide_track_left_quarter_turn_5(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -904,22 +832,14 @@ static void dinghy_slide_track_left_quarter_turn_5(
 }
 
 static void dinghy_slide_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     dinghy_slide_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void dinghy_slide_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4][2] = {
@@ -961,19 +881,14 @@ static void dinghy_slide_track_s_bend_left(
             if (direction == 0 || direction == 1)
             {
                 metal_a_supports_paint_setup(
-                    session,
-                    METAL_SUPPORTS_TUBES,
-                    5 + (direction & 1),
-                    (direction & 1),
-                    height,
+                    session, METAL_SUPPORTS_TUBES, 5 + (direction & 1), (direction & 1), height,
                     session->TrackColours[SCHEME_SUPPORTS]);
             }
             paint_util_set_segment_support_height(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 2:
             bboy = (direction == 2 || direction == 3) ? 0 : 6;
@@ -982,19 +897,14 @@ static void dinghy_slide_track_s_bend_left(
             if (direction == 2 || direction == 3)
             {
                 metal_a_supports_paint_setup(
-                    session,
-                    METAL_SUPPORTS_TUBES,
-                    5 + (direction & 1),
-                    (direction & 1),
-                    height,
+                    session, METAL_SUPPORTS_TUBES, 5 + (direction & 1), (direction & 1), height,
                     session->TrackColours[SCHEME_SUPPORTS]);
             }
             paint_util_set_segment_support_height(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
@@ -1024,11 +934,7 @@ static void dinghy_slide_track_s_bend_left(
 }
 
 static void dinghy_slide_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4][2] = {
@@ -1076,8 +982,7 @@ static void dinghy_slide_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 2:
             bboy = (direction == 0 || direction == 1) ? 0 : 6;
@@ -1092,8 +997,7 @@ static void dinghy_slide_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
@@ -1123,11 +1027,7 @@ static void dinghy_slide_track_s_bend_right(
 }
 
 static void dinghy_slide_track_right_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const sprite_bb imageIds[4][3] = {
@@ -1208,11 +1108,7 @@ static void dinghy_slide_track_right_quarter_turn_3(
 }
 
 static void dinghy_slide_track_left_quarter_turn_3(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -1220,11 +1116,7 @@ static void dinghy_slide_track_left_quarter_turn_3(
 }
 
 static void dinghy_slide_track_flat_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -1253,11 +1145,7 @@ static void dinghy_slide_track_flat_covered(
 }
 
 static void dinghy_slide_track_25_deg_up_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -1293,11 +1181,7 @@ static void dinghy_slide_track_25_deg_up_covered(
 }
 
 static void dinghy_slide_track_60_deg_up_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -1333,11 +1217,7 @@ static void dinghy_slide_track_60_deg_up_covered(
 }
 
 static void dinghy_slide_track_flat_to_25_deg_up_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -1373,11 +1253,7 @@ static void dinghy_slide_track_flat_to_25_deg_up_covered(
 }
 
 static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -1413,11 +1289,7 @@ static void dinghy_slide_track_25_deg_up_to_60_deg_up_covered(
 }
 
 static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -1453,11 +1325,7 @@ static void dinghy_slide_track_60_deg_up_to_25_deg_up_covered(
 }
 
 static void dinghy_slide_track_25_deg_up_to_flat_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -1493,44 +1361,28 @@ static void dinghy_slide_track_25_deg_up_to_flat_covered(
 }
 
 static void dinghy_slide_track_25_deg_down_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     dinghy_slide_track_25_deg_up_covered(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void dinghy_slide_track_60_deg_down_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     dinghy_slide_track_60_deg_up_covered(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void dinghy_slide_track_flat_to_25_deg_down_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     dinghy_slide_track_25_deg_up_to_flat_covered(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void dinghy_slide_track_25_deg_down_to_60_deg_down_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     dinghy_slide_track_60_deg_up_to_25_deg_up_covered(
@@ -1538,22 +1390,14 @@ static void dinghy_slide_track_25_deg_down_to_60_deg_down_covered(
 }
 
 static void dinghy_slide_track_25_deg_down_to_flat_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     dinghy_slide_track_flat_to_25_deg_up_covered(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void dinghy_slide_track_right_quarter_turn_5_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const sprite_bb imageIds[4][5] = {
@@ -1658,8 +1502,7 @@ static void dinghy_slide_track_right_quarter_turn_5_covered(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
@@ -1670,8 +1513,7 @@ static void dinghy_slide_track_right_quarter_turn_5_covered(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D4 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 6:
             paint_util_set_segment_support_height(
@@ -1683,11 +1525,7 @@ static void dinghy_slide_track_right_quarter_turn_5_covered(
 }
 
 static void dinghy_slide_track_left_quarter_turn_5_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn5TilesToRightQuarterTurn5Tiles[trackSequence];
@@ -1696,11 +1534,7 @@ static void dinghy_slide_track_left_quarter_turn_5_covered(
 }
 
 static void dinghy_slide_track_s_bend_left_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4][2] = {
@@ -1742,19 +1576,14 @@ static void dinghy_slide_track_s_bend_left_covered(
             if (direction == 0 || direction == 1)
             {
                 metal_a_supports_paint_setup(
-                    session,
-                    METAL_SUPPORTS_TUBES,
-                    5 + (direction & 1),
-                    (direction & 1),
-                    height,
+                    session, METAL_SUPPORTS_TUBES, 5 + (direction & 1), (direction & 1), height,
                     session->TrackColours[SCHEME_SUPPORTS]);
             }
             paint_util_set_segment_support_height(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 2:
             bboy = (direction == 2 || direction == 3) ? 0 : 6;
@@ -1763,19 +1592,14 @@ static void dinghy_slide_track_s_bend_left_covered(
             if (direction == 2 || direction == 3)
             {
                 metal_a_supports_paint_setup(
-                    session,
-                    METAL_SUPPORTS_TUBES,
-                    5 + (direction & 1),
-                    (direction & 1),
-                    height,
+                    session, METAL_SUPPORTS_TUBES, 5 + (direction & 1), (direction & 1), height,
                     session->TrackColours[SCHEME_SUPPORTS]);
             }
             paint_util_set_segment_support_height(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
@@ -1805,11 +1629,7 @@ static void dinghy_slide_track_s_bend_left_covered(
 }
 
 static void dinghy_slide_track_s_bend_right_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4][2] = {
@@ -1857,8 +1677,7 @@ static void dinghy_slide_track_s_bend_right_covered(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 2:
             bboy = (direction == 0 || direction == 1) ? 0 : 6;
@@ -1873,8 +1692,7 @@ static void dinghy_slide_track_s_bend_right_covered(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
@@ -1904,11 +1722,7 @@ static void dinghy_slide_track_s_bend_right_covered(
 }
 
 static void dinghy_slide_track_right_quarter_turn_3_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const sprite_bb imageIds[4][3] = {
@@ -1989,11 +1803,7 @@ static void dinghy_slide_track_right_quarter_turn_3_covered(
 }
 
 static void dinghy_slide_track_left_quarter_turn_3_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = mapLeftQuarterTurn3TilesToRightQuarterTurn3Tiles[trackSequence];
@@ -2002,11 +1812,7 @@ static void dinghy_slide_track_left_quarter_turn_3_covered(
 }
 
 static void dinghy_slide_track_60_deg_down_to_25_deg_down_covered(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     dinghy_slide_track_25_deg_up_to_60_deg_up_covered(
diff --git a/src/openrct2/ride/water/LogFlume.cpp b/src/openrct2/ride/water/LogFlume.cpp
index 764c535fd1..dca17ddd7f 100644
--- a/src/openrct2/ride/water/LogFlume.cpp
+++ b/src/openrct2/ride/water/LogFlume.cpp
@@ -162,11 +162,7 @@ static constexpr const uint32_t LogFlumeTrackFlatImageIds[4][2] = {
 };
 
 static void paint_log_flume_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = LogFlumeTrackFlatImageIds[direction][0] | session->TrackColours[SCHEME_TRACK];
@@ -187,11 +183,7 @@ static void paint_log_flume_track_flat(
 }
 
 static void paint_log_flume_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    [[maybe_unused]] uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, [[maybe_unused]] uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = LogFlumeTrackFlatImageIds[direction][0] | session->TrackColours[SCHEME_TRACK];
@@ -228,11 +220,7 @@ static void paint_log_flume_track_station(
 }
 
 static void paint_log_flume_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -267,11 +255,7 @@ static void paint_log_flume_track_25_deg_up(
 }
 
 static void paint_log_flume_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -306,11 +290,7 @@ static void paint_log_flume_track_flat_to_25_deg_up(
 }
 
 static void paint_log_flume_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -345,11 +325,7 @@ static void paint_log_flume_track_25_deg_up_to_flat(
 }
 
 static void paint_log_flume_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -384,11 +360,7 @@ static void paint_log_flume_track_25_deg_down(
 }
 
 static void paint_log_flume_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -423,11 +395,7 @@ static void paint_log_flume_track_flat_to_25_deg_down(
 }
 
 static void paint_log_flume_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
@@ -462,11 +430,7 @@ static void paint_log_flume_track_25_deg_down_to_flat(
 }
 
 static void paint_log_flume_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4][2] = {
@@ -508,19 +472,14 @@ static void paint_log_flume_track_s_bend_left(
             if (direction == 0 || direction == 1)
             {
                 metal_a_supports_paint_setup(
-                    session,
-                    METAL_SUPPORTS_BOXED,
-                    5 + (direction & 1),
-                    (direction & 1),
-                    height,
+                    session, METAL_SUPPORTS_BOXED, 5 + (direction & 1), (direction & 1), height,
                     session->TrackColours[SCHEME_SUPPORTS]);
             }
             paint_util_set_segment_support_height(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 2:
             bboy = (direction == 2 || direction == 3) ? 0 : 6;
@@ -529,19 +488,14 @@ static void paint_log_flume_track_s_bend_left(
             if (direction == 2 || direction == 3)
             {
                 metal_a_supports_paint_setup(
-                    session,
-                    METAL_SUPPORTS_BOXED,
-                    5 + (direction & 1),
-                    (direction & 1),
-                    height,
+                    session, METAL_SUPPORTS_BOXED, 5 + (direction & 1), (direction & 1), height,
                     session->TrackColours[SCHEME_SUPPORTS]);
             }
             paint_util_set_segment_support_height(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
@@ -571,11 +525,7 @@ static void paint_log_flume_track_s_bend_left(
 }
 
 static void paint_log_flume_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4][2] = {
@@ -623,8 +573,7 @@ static void paint_log_flume_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 2:
             bboy = (direction == 0 || direction == 1) ? 0 : 6;
@@ -639,8 +588,7 @@ static void paint_log_flume_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
@@ -670,11 +618,7 @@ static void paint_log_flume_track_s_bend_right(
 }
 
 static void paint_log_flume_track_left_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -685,17 +629,13 @@ static void paint_log_flume_track_left_quarter_turn_3_tiles(
     };
 
     static constexpr const uint32_t imageIdsFront[4][3] = {
-        { SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_0,
-          SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_2,
+        { SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_2,
           SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_3 },
-        { SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_0,
-          SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_2,
+        { SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_2,
           SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_3 },
-        { SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_0,
-          SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_2,
+        { SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_2,
           SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_3 },
-        { SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_0,
-          SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_2,
+        { SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_2,
           SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_3 },
     };
 
@@ -745,11 +685,7 @@ static void paint_log_flume_track_left_quarter_turn_3_tiles(
 }
 
 static void paint_log_flume_track_right_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][3] = {
@@ -760,17 +696,13 @@ static void paint_log_flume_track_right_quarter_turn_3_tiles(
     };
 
     static constexpr const uint32_t imageIdsFront[4][3] = {
-        { SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_0,
-          SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_2,
+        { SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_2,
           SPR_LOG_FLUME_3_TURN_FRONT_NW_NE_SEQ_3 },
-        { SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_0,
-          SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_2,
+        { SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_2,
           SPR_LOG_FLUME_3_TURN_FRONT_SW_SE_SEQ_3 },
-        { SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_0,
-          SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_2,
+        { SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_2,
           SPR_LOG_FLUME_3_TURN_FRONT_SE_SW_SEQ_3 },
-        { SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_0,
-          SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_2,
+        { SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_0, SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_2,
           SPR_LOG_FLUME_3_TURN_FRONT_SW_NW_SEQ_3 },
     };
 
@@ -820,11 +752,7 @@ static void paint_log_flume_track_right_quarter_turn_3_tiles(
 }
 
 static void paint_log_flume_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = SPR_STATION_BASE_D | IMAGE_TYPE_REMAP;
@@ -855,11 +783,7 @@ static void paint_log_flume_track_on_ride_photo(
 }
 
 static void paint_log_flume_track_reverser(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][2] = {
diff --git a/src/openrct2/ride/water/RiverRapids.cpp b/src/openrct2/ride/water/RiverRapids.cpp
index dc00ece1c3..29f06c7189 100644
--- a/src/openrct2/ride/water/RiverRapids.cpp
+++ b/src/openrct2/ride/water/RiverRapids.cpp
@@ -178,12 +178,7 @@ static constexpr const uint32_t river_rapids_track_pieces_25_deg_down_to_flat[][
  *  rct2: 0x006D5889
  */
 void vehicle_visual_river_rapids(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     int32_t image_id;
@@ -246,16 +241,7 @@ void vehicle_visual_river_rapids(
             image_id = (baseImage_id + ((peeps + 1) * 72))
                 | SPRITE_ID_PALETTE_COLOUR_2(vehicle->peep_tshirt_colours[2], vehicle->peep_tshirt_colours[3]);
             sub_98199C(
-                session,
-                image_id,
-                0,
-                0,
-                bb->length_x,
-                bb->length_y,
-                bb->length_z,
-                z,
-                bb->offset_x,
-                bb->offset_y,
+                session, image_id, 0, 0, bb->length_x, bb->length_y, bb->length_z, z, bb->offset_x, bb->offset_y,
                 bb->offset_z + z);
         }
         if (vehicle->num_peeps > 4)
@@ -264,16 +250,7 @@ void vehicle_visual_river_rapids(
             image_id = (baseImage_id + ((peeps + 1) * 72))
                 | SPRITE_ID_PALETTE_COLOUR_2(vehicle->peep_tshirt_colours[4], vehicle->peep_tshirt_colours[5]);
             sub_98199C(
-                session,
-                image_id,
-                0,
-                0,
-                bb->length_x,
-                bb->length_y,
-                bb->length_z,
-                z,
-                bb->offset_x,
-                bb->offset_y,
+                session, image_id, 0, 0, bb->length_x, bb->length_y, bb->length_z, z, bb->offset_x, bb->offset_y,
                 bb->offset_z + z);
         }
         if (vehicle->num_peeps > 6)
@@ -282,16 +259,7 @@ void vehicle_visual_river_rapids(
             image_id = (baseImage_id + ((peeps + 1) * 72))
                 | SPRITE_ID_PALETTE_COLOUR_2(vehicle->peep_tshirt_colours[6], vehicle->peep_tshirt_colours[7]);
             sub_98199C(
-                session,
-                image_id,
-                0,
-                0,
-                bb->length_x,
-                bb->length_y,
-                bb->length_z,
-                z,
-                bb->offset_x,
-                bb->offset_y,
+                session, image_id, 0, 0, bb->length_x, bb->length_y, bb->length_z, z, bb->offset_x, bb->offset_y,
                 bb->offset_z + z);
         }
     }
@@ -302,11 +270,7 @@ void vehicle_visual_river_rapids(
 
 /** rct2: 0x00757650 */
 static void paint_river_rapids_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -349,11 +313,7 @@ static void paint_river_rapids_track_flat(
 
 /** rct2: 0x007576C0 */
 static void paint_river_rapids_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     Ride* ride = get_ride(rideIndex);
@@ -542,11 +502,7 @@ static void paint_river_rapids_track_25_deg_to_flat_b(
 
 /** rct2: 0x00757660 */
 static void paint_river_rapids_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_river_rapids_track_25_deg(session, direction, height, river_rapids_track_pieces_25_deg_up);
@@ -554,11 +510,7 @@ static void paint_river_rapids_track_25_deg_up(
 
 /** rct2: 0x00757670 */
 static void paint_river_rapids_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_river_rapids_track_25_deg_to_flat_b(session, direction, height, river_rapids_track_pieces_flat_to_25_deg_up);
@@ -566,11 +518,7 @@ static void paint_river_rapids_track_flat_to_25_deg_up(
 
 /** rct2: 0x00757680 */
 static void paint_river_rapids_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_river_rapids_track_25_deg_to_flat_a(session, direction, height, river_rapids_track_pieces_25_deg_up_to_flat);
@@ -578,11 +526,7 @@ static void paint_river_rapids_track_25_deg_up_to_flat(
 
 /** rct2: 0x00757690 */
 static void paint_river_rapids_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_river_rapids_track_25_deg(session, (direction + 2) % 4, height, river_rapids_track_pieces_25_deg_down);
@@ -590,11 +534,7 @@ static void paint_river_rapids_track_25_deg_down(
 
 /** rct2: 0x007576A0 */
 static void paint_river_rapids_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_river_rapids_track_25_deg_to_flat_a(
@@ -603,11 +543,7 @@ static void paint_river_rapids_track_flat_to_25_deg_down(
 
 /** rct2: 0x007576B0 */
 static void paint_river_rapids_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_river_rapids_track_25_deg_to_flat_b(
@@ -616,11 +552,7 @@ static void paint_river_rapids_track_25_deg_down_to_flat(
 
 /** rct2: 0x007576F0 */
 static void paint_river_rapids_track_left_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -676,11 +608,7 @@ static void paint_river_rapids_track_left_quarter_turn_1_tile(
 
 /** rct2: 0x00757700 */
 static void paint_river_rapids_track_right_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -737,11 +665,7 @@ static void paint_river_rapids_track_right_quarter_turn_1_tile(
 
 /** rct2: 0x00757710 */
 static void paint_river_rapids_track_waterfall(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -804,11 +728,7 @@ static void paint_river_rapids_track_waterfall(
 
 /** rct2: 0x00757720 */
 static void paint_river_rapids_track_rapids(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -849,11 +769,7 @@ static void paint_river_rapids_track_rapids(
 
 /** rct2: 0x00757740 */
 static void paint_river_rapids_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_river_rapids_track_flat(session, rideIndex, trackSequence, direction, height, tileElement);
@@ -863,11 +779,7 @@ static void paint_river_rapids_track_on_ride_photo(
 
 /** rct2: 0x */
 static void paint_river_rapids_track_whirlpool(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp
index cb1a08d492..b89cd74a59 100644
--- a/src/openrct2/ride/water/SplashBoats.cpp
+++ b/src/openrct2/ride/water/SplashBoats.cpp
@@ -474,11 +474,7 @@ static constexpr const sprite_bb RiverRaftsRightQuarterTurn5_Side[4][5] = {
 };
 
 static void paint_splash_boats_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = SplashBoats25DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK];
@@ -503,11 +499,7 @@ static void paint_splash_boats_track_25_deg_up(
 }
 
 static void paint_splash_boats_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = SplashBoats60DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK];
@@ -532,11 +524,7 @@ static void paint_splash_boats_track_60_deg_up(
 }
 
 static void paint_splash_boats_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = SplashBoatsFlatTo25DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK];
@@ -561,11 +549,7 @@ static void paint_splash_boats_track_flat_to_25_deg_up(
 }
 
 static void paint_splash_boats_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = SplashBoats25DegUpToFlatImageId[direction] | session->TrackColours[SCHEME_TRACK];
@@ -590,11 +574,7 @@ static void paint_splash_boats_track_25_deg_up_to_flat(
 }
 
 static void paint_splash_boats_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = SplashBoats25DegUpTo60DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK];
@@ -619,11 +599,7 @@ static void paint_splash_boats_track_25_deg_up_to_60_deg_up(
 }
 
 static void paint_splash_boats_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = SplashBoats60DegUpTo25DegUpImageId[direction] | session->TrackColours[SCHEME_TRACK];
@@ -648,11 +624,7 @@ static void paint_splash_boats_track_60_deg_up_to_25_deg_up(
 }
 
 static void paint_splash_boats_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = SplashBoats25DegDownImageId[direction] | session->TrackColours[SCHEME_TRACK];
@@ -678,22 +650,14 @@ static void paint_splash_boats_track_25_deg_down(
 }
 
 static void paint_splash_boats_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_splash_boats_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void paint_splash_boats_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = SplashBoatsFlatTo25DegDownImageId[direction] | session->TrackColours[SCHEME_TRACK];
@@ -719,11 +683,7 @@ static void paint_splash_boats_track_flat_to_25_deg_down(
 }
 
 static void paint_splash_boats_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_splash_boats_track_60_deg_up_to_25_deg_up(
@@ -731,11 +691,7 @@ static void paint_splash_boats_track_25_deg_down_to_60_deg_down(
 }
 
 static void paint_splash_boats_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     paint_splash_boats_track_25_deg_up_to_60_deg_up(
@@ -743,11 +699,7 @@ static void paint_splash_boats_track_60_deg_down_to_25_deg_down(
 }
 
 static void paint_splash_boats_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId = SplashBoats25DegDownToFlatImageId[direction] | session->TrackColours[SCHEME_TRACK];
@@ -785,11 +737,7 @@ static void paint_splash_boats_track_25_deg_down_to_flat(
 /** Start of elements originally from River Rafts */
 /** rct2: 0x0089B170 */
 static void paint_splash_boats_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     uint32_t imageId;
@@ -832,11 +780,7 @@ static void paint_splash_boats_track_flat(
 
 /** rct2: 0x0089B1A0 */
 static void paint_splash_boats_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     Ride* ride = get_ride(rideIndex);
@@ -872,11 +816,7 @@ static void paint_splash_boats_station(
 
 /** rct2: 0x0089B1D0 */
 static void paint_splash_boats_track_left_quarter_turn_5_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_right_quarter_turn_5_tiles_paint_2(
@@ -910,8 +850,7 @@ static void paint_splash_boats_track_left_quarter_turn_5_tiles(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C8 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_B4 | SEGMENT_B8 | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
@@ -919,8 +858,7 @@ static void paint_splash_boats_track_left_quarter_turn_5_tiles(
                 paint_util_rotate_segments(
                     SEGMENT_CC | SEGMENT_D4 | SEGMENT_BC | SEGMENT_C4 | SEGMENT_B4 | SEGMENT_C0 | SEGMENT_C8 | SEGMENT_D0,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 4:
             paint_util_set_segment_support_height(
@@ -931,8 +869,7 @@ static void paint_splash_boats_track_left_quarter_turn_5_tiles(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_C8 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_D0 | SEGMENT_C0 | SEGMENT_B8, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 6:
             paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@@ -960,11 +897,7 @@ static void paint_splash_boats_track_left_quarter_turn_5_tiles(
 
 /** rct2: 0x0089B1D0 */
 static void paint_splash_boats_track_right_quarter_turn_5_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_right_quarter_turn_5_tiles_paint_2(
@@ -998,8 +931,7 @@ static void paint_splash_boats_track_right_quarter_turn_5_tiles(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D0 | SEGMENT_C4 | SEGMENT_D4 | SEGMENT_BC | SEGMENT_C0 | SEGMENT_CC, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             paint_util_set_segment_support_height(
@@ -1007,8 +939,7 @@ static void paint_splash_boats_track_right_quarter_turn_5_tiles(
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_C4 | SEGMENT_B8 | SEGMENT_BC | SEGMENT_D0 | SEGMENT_D4,
                     direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 4:
             paint_util_set_segment_support_height(
@@ -1019,8 +950,7 @@ static void paint_splash_boats_track_right_quarter_turn_5_tiles(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_D4 | SEGMENT_C4 | SEGMENT_D0 | SEGMENT_B8 | SEGMENT_C0 | SEGMENT_C8, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 6:
             paint_util_set_segment_support_height(session, SEGMENTS_ALL, 0xFFFF, 0);
@@ -1048,11 +978,7 @@ static void paint_splash_boats_track_right_quarter_turn_5_tiles(
 
 /** rct2: 0x0089B180 */
 static void paint_splash_boats_track_s_bend_left(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4][2] = {
@@ -1100,8 +1026,7 @@ static void paint_splash_boats_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 2:
             bboy = (direction == 2 || direction == 3) ? 0 : 6;
@@ -1115,8 +1040,7 @@ static void paint_splash_boats_track_s_bend_left(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
@@ -1146,11 +1070,7 @@ static void paint_splash_boats_track_s_bend_left(
 
 /** rct2: 0x0089B190 */
 static void paint_splash_boats_track_s_bend_right(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     static constexpr const uint32_t imageIds[4][4][2] = {
@@ -1198,8 +1118,7 @@ static void paint_splash_boats_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_BC | SEGMENT_C0 | SEGMENT_C4 | SEGMENT_CC | SEGMENT_D0 | SEGMENT_D4, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 2:
             bboy = (direction == 0 || direction == 1) ? 0 : 6;
@@ -1213,8 +1132,7 @@ static void paint_splash_boats_track_s_bend_right(
                 session,
                 paint_util_rotate_segments(
                     SEGMENT_B4 | SEGMENT_B8 | SEGMENT_C4 | SEGMENT_C8 | SEGMENT_CC | SEGMENT_D0, direction),
-                0xFFFF,
-                0);
+                0xFFFF, 0);
             break;
         case 3:
             sub_98197C_rotated(session, direction, imageId, 0, 0, 32, 27, 2, height, 0, 2, height);
@@ -1243,11 +1161,7 @@ static void paint_splash_boats_track_s_bend_right(
 }
 
 static void paint_splash_boats_track_on_ride_photo(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     switch (direction)
@@ -1333,12 +1247,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_splash_boats(int32_t trackType, in
  *  rct2: 0x006D4295
  */
 void vehicle_visual_splash_boats_or_water_coaster(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     if (vehicle->is_child)
diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp
index b7d16d9ba5..1adc5719e2 100644
--- a/src/openrct2/ride/water/SubmarineRide.cpp
+++ b/src/openrct2/ride/water/SubmarineRide.cpp
@@ -21,12 +21,7 @@
  *  rct2: 0x006D44D5
  */
 void vehicle_visual_submarine(
-    paint_session* session,
-    int32_t x,
-    int32_t imageDirection,
-    int32_t y,
-    int32_t z,
-    const rct_vehicle* vehicle,
+    paint_session* session, int32_t x, int32_t imageDirection, int32_t y, int32_t z, const rct_vehicle* vehicle,
     const rct_ride_entry_vehicle* vehicleEntry)
 {
     int32_t baseImage_id = imageDirection;
@@ -80,11 +75,7 @@ void vehicle_visual_submarine(
 #endif
 
 static void submarine_ride_paint_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -117,11 +108,7 @@ static void submarine_ride_paint_track_station(
 }
 
 static void submarine_ride_paint_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     LocationXY16 position = session->MapPosition;
@@ -144,11 +131,7 @@ static void submarine_ride_paint_track_flat(
     if (track_paint_util_should_paint_supports(position))
     {
         metal_a_supports_paint_setup(
-            session,
-            (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK,
-            4,
-            -1,
-            heightLower,
+            session, (direction & 1) ? METAL_SUPPORTS_STICK_ALT : METAL_SUPPORTS_STICK, 4, -1, heightLower,
             session->TrackColours[SCHEME_SUPPORTS]);
     }
 
@@ -158,20 +141,11 @@ static void submarine_ride_paint_track_flat(
 }
 
 static void submarine_ride_paint_track_left_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_left_quarter_turn_3_tiles_paint(
-        session,
-        3,
-        height - 16,
-        direction,
-        trackSequence,
-        session->TrackColours[SCHEME_TRACK],
+        session, 3, height - 16, direction, trackSequence, session->TrackColours[SCHEME_TRACK],
         trackSpritesSubmarineRideMiniHelicoptersQuarterTurn3Tiles);
     track_paint_util_left_quarter_turn_3_tiles_tunnel(session, height - 16, TUNNEL_0, direction, trackSequence);
 
@@ -200,11 +174,7 @@ static void submarine_ride_paint_track_left_quarter_turn_3_tiles(
 
 static constexpr const uint8_t submarine_ride_right_quarter_turn_3_tiles_to_left_turn_map[] = { 3, 1, 2, 0 };
 static void submarine_ride_paint_track_right_quarter_turn_3_tiles(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = submarine_ride_right_quarter_turn_3_tiles_to_left_turn_map[trackSequence];
@@ -213,20 +183,11 @@ static void submarine_ride_paint_track_right_quarter_turn_3_tiles(
 }
 
 static void submarine_ride_paint_track_left_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     track_paint_util_left_quarter_turn_1_tile_paint(
-        session,
-        1,
-        height - 16,
-        0,
-        direction,
-        session->TrackColours[SCHEME_TRACK],
+        session, 1, height - 16, 0, direction, session->TrackColours[SCHEME_TRACK],
         trackSpritesSubmarineRideMiniHelicoptersQuarterTurn1Tile);
     track_paint_util_left_quarter_turn_1_tile_tunnel(session, direction, height - 16, 0, TUNNEL_0, 0, TUNNEL_0);
 
@@ -236,11 +197,7 @@ static void submarine_ride_paint_track_left_quarter_turn_1_tile(
 }
 
 static void submarine_ride_paint_track_right_quarter_turn_1_tile(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     submarine_ride_paint_track_left_quarter_turn_1_tile(
diff --git a/src/openrct2/ride/water/WaterCoaster.cpp b/src/openrct2/ride/water/WaterCoaster.cpp
index 4064054b21..71fc7fef72 100644
--- a/src/openrct2/ride/water/WaterCoaster.cpp
+++ b/src/openrct2/ride/water/WaterCoaster.cpp
@@ -13,275 +13,152 @@
 #include "../coaster/JuniorRollerCoaster.h"
 
 static void water_rc_track_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_flat(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void water_rc_track_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_25_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void water_rc_track_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_flat_to_25_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void water_rc_track_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_25_deg_up_to_flat(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void water_rc_track_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     water_rc_track_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void water_rc_track_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     water_rc_track_25_deg_up_to_flat(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void water_rc_track_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     water_rc_track_flat_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) & 3, height, tileElement);
 }
 
 static void water_rc_track_diag_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_flat(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void water_rc_track_diag_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_25_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void water_rc_track_diag_flat_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_flat_to_25_deg_up(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void water_rc_track_diag_25_deg_up_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_25_deg_up_to_flat(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void water_rc_track_diag_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_25_deg_down(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void water_rc_track_diag_flat_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_flat_to_25_deg_down(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void water_rc_track_diag_25_deg_down_to_flat(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     bool isChained = track_element_is_lift_hill(tileElement);
     junior_rc_paint_track_diag_25_deg_down_to_flat(
-        session,
-        rideIndex,
-        trackSequence,
-        direction,
-        height,
-        tileElement,
+        session, rideIndex, trackSequence, direction, height, tileElement,
         isChained ? JUNIOR_RC_CHAIN_CHAIN_LIFT : JUNIOR_RC_CHAIN_NONE);
 }
 
 static void water_rc_track_station(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_station(session, rideIndex, trackSequence, direction, height, tileElement, RIDE_TYPE_WATER_COASTER);
 }
 
 static void water_rc_track_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_track_60_deg_up(session, rideIndex, trackSequence, direction, height, tileElement, JUNIOR_RC_CHAIN_NONE);
 }
 
 static void water_rc_track_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_track_25_deg_up_to_60_deg_up(
@@ -289,11 +166,7 @@ static void water_rc_track_25_deg_up_to_60_deg_up(
 }
 
 static void water_rc_track_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_track_60_deg_up_to_25_deg_up(
@@ -301,33 +174,21 @@ static void water_rc_track_60_deg_up_to_25_deg_up(
 }
 
 static void water_rc_track_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     water_rc_track_60_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
 }
 
 static void water_rc_track_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     water_rc_track_60_deg_up_to_25_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
 }
 
 static void water_rc_track_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     water_rc_track_25_deg_up_to_60_deg_up(session, rideIndex, trackSequence, (direction + 2) % 4, height, tileElement);
@@ -336,11 +197,7 @@ static void water_rc_track_60_deg_down_to_25_deg_down(
 // 5 tile turns
 
 static void water_rc_track_left_quarter_turn_5_tiles_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_track_left_quarter_turn_5_tiles_25_deg_up(
@@ -348,11 +205,7 @@ static void water_rc_track_left_quarter_turn_5_tiles_25_deg_up(
 }
 
 static void water_rc_track_right_quarter_turn_5_tiles_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_track_right_quarter_turn_5_tiles_25_deg_up(
@@ -362,47 +215,27 @@ static void water_rc_track_right_quarter_turn_5_tiles_25_deg_up(
 static constexpr const uint8_t water_rc_left_quarter_turn_5_tiles_to_right_turn_map[] = { 6, 4, 5, 3, 1, 2, 0 };
 
 static void water_rc_track_left_quarter_turn_5_tiles_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     water_rc_track_right_quarter_turn_5_tiles_25_deg_up(
-        session,
-        rideIndex,
-        water_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence],
-        (direction + 1) % 4,
-        height,
+        session, rideIndex, water_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence], (direction + 1) % 4, height,
         tileElement);
 }
 
 static void water_rc_track_right_quarter_turn_5_tiles_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     water_rc_track_left_quarter_turn_5_tiles_25_deg_up(
-        session,
-        rideIndex,
-        water_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence],
-        (direction + 3) % 4,
-        height,
+        session, rideIndex, water_rc_left_quarter_turn_5_tiles_to_right_turn_map[trackSequence], (direction + 3) % 4, height,
         tileElement);
 }
 
 // 3 tile turns
 
 static void water_rc_track_right_quarter_turn_3_tiles_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_up(
@@ -410,11 +243,7 @@ static void water_rc_track_right_quarter_turn_3_tiles_25_deg_up(
 }
 
 static void water_rc_track_right_quarter_turn_3_tiles_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_track_right_quarter_turn_3_tiles_25_deg_down(
@@ -424,11 +253,7 @@ static void water_rc_track_right_quarter_turn_3_tiles_25_deg_down(
 static constexpr const uint8_t water_rc_left_quarter_turn_3_tiles_to_right_turn_map[] = { 3, 1, 2, 0 };
 
 static void water_rc_track_left_quarter_turn_3_tiles_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = water_rc_left_quarter_turn_3_tiles_to_right_turn_map[trackSequence];
@@ -437,11 +262,7 @@ static void water_rc_track_left_quarter_turn_3_tiles_25_deg_up(
 }
 
 static void water_rc_track_left_quarter_turn_3_tiles_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     trackSequence = water_rc_left_quarter_turn_3_tiles_to_right_turn_map[trackSequence];
@@ -450,11 +271,7 @@ static void water_rc_track_left_quarter_turn_3_tiles_25_deg_down(
 }
 
 static void water_rc_track_diag_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_track_diag_60_deg_up(
@@ -462,11 +279,7 @@ static void water_rc_track_diag_60_deg_up(
 }
 
 static void water_rc_track_diag_25_deg_up_to_60_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_track_diag_25_deg_up_to_60_deg_up(
@@ -474,11 +287,7 @@ static void water_rc_track_diag_25_deg_up_to_60_deg_up(
 }
 
 static void water_rc_track_diag_60_deg_up_to_25_deg_up(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_track_diag_60_deg_up_to_25_deg_up(
@@ -486,11 +295,7 @@ static void water_rc_track_diag_60_deg_up_to_25_deg_up(
 }
 
 static void water_rc_track_diag_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_track_diag_60_deg_down(
@@ -498,11 +303,7 @@ static void water_rc_track_diag_60_deg_down(
 }
 
 static void water_rc_track_diag_25_deg_down_to_60_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_track_diag_25_deg_down_to_60_deg_down(
@@ -510,11 +311,7 @@ static void water_rc_track_diag_25_deg_down_to_60_deg_down(
 }
 
 static void water_rc_track_diag_60_deg_down_to_25_deg_down(
-    paint_session* session,
-    uint8_t rideIndex,
-    uint8_t trackSequence,
-    uint8_t direction,
-    int32_t height,
+    paint_session* session, uint8_t rideIndex, uint8_t trackSequence, uint8_t direction, int32_t height,
     const rct_tile_element* tileElement)
 {
     junior_rc_paint_track_diag_60_deg_down_to_25_deg_down(
diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp
index 7c05456d97..6a8e8a7c7c 100644
--- a/src/openrct2/scenario/Scenario.cpp
+++ b/src/openrct2/scenario/Scenario.cpp
@@ -566,14 +566,8 @@ void dbg_report_desync(uint32_t tick, uint32_t srand0, uint32_t server_srand0, c
         const bool sprites_mismatch = serverHash[0] != '\0' && strcmp(clientHash, serverHash);
 
         fprintf(
-            fp,
-            "[%s] !! DESYNC !! Tick: %d, Client Hash: %s, Server Hash: %s, Client Rand: %08X, Server Rand: %08X - %s\n",
-            realm,
-            tick,
-            clientHash,
-            ((serverHash[0] != '\0') ? serverHash : "<NONE:0>"),
-            srand0,
-            server_srand0,
+            fp, "[%s] !! DESYNC !! Tick: %d, Client Hash: %s, Server Hash: %s, Client Rand: %08X, Server Rand: %08X - %s\n",
+            realm, tick, clientHash, ((serverHash[0] != '\0') ? serverHash : "<NONE:0>"), srand0, server_srand0,
             (sprites_mismatch ? "Sprite hash mismatch" : "scenario rand mismatch"));
     }
 }
diff --git a/src/openrct2/scenario/ScenarioRepository.cpp b/src/openrct2/scenario/ScenarioRepository.cpp
index 734d5d3134..21325540b5 100644
--- a/src/openrct2/scenario/ScenarioRepository.cpp
+++ b/src/openrct2/scenario/ScenarioRepository.cpp
@@ -132,11 +132,7 @@ private:
 public:
     explicit ScenarioFileIndex(const IPlatformEnvironment& env)
         : FileIndex(
-              "scenario index",
-              MAGIC_NUMBER,
-              VERSION,
-              env.GetFilePath(PATHID::CACHE_SCENARIOS),
-              std::string(PATTERN),
+              "scenario index", MAGIC_NUMBER, VERSION, env.GetFilePath(PATHID::CACHE_SCENARIOS), std::string(PATTERN),
               std::vector<std::string>({
                   env.GetDirectoryPath(DIRBASE::RCT1, DIRID::SCENARIO),
                   env.GetDirectoryPath(DIRBASE::RCT2, DIRID::SCENARIO),
diff --git a/src/openrct2/windows/_legacy.cpp b/src/openrct2/windows/_legacy.cpp
index 2119878314..474dcd90c5 100644
--- a/src/openrct2/windows/_legacy.cpp
+++ b/src/openrct2/windows/_legacy.cpp
@@ -29,13 +29,8 @@
 bool gDisableErrorWindowSound = false;
 
 void game_command_callback_pickup_guest(
-    int32_t eax,
-    int32_t ebx,
-    int32_t ecx,
-    [[maybe_unused]] int32_t edx,
-    [[maybe_unused]] int32_t esi,
-    [[maybe_unused]] int32_t edi,
-    [[maybe_unused]] int32_t ebp)
+    int32_t eax, int32_t ebx, int32_t ecx, [[maybe_unused]] int32_t edx, [[maybe_unused]] int32_t esi,
+    [[maybe_unused]] int32_t edi, [[maybe_unused]] int32_t ebp)
 {
     switch (ecx)
     {
@@ -60,13 +55,8 @@ void game_command_callback_pickup_guest(
 }
 
 void game_command_callback_hire_new_staff_member(
-    [[maybe_unused]] int32_t eax,
-    [[maybe_unused]] int32_t ebx,
-    [[maybe_unused]] int32_t ecx,
-    [[maybe_unused]] int32_t edx,
-    [[maybe_unused]] int32_t esi,
-    int32_t edi,
-    [[maybe_unused]] int32_t ebp)
+    [[maybe_unused]] int32_t eax, [[maybe_unused]] int32_t ebx, [[maybe_unused]] int32_t ecx, [[maybe_unused]] int32_t edx,
+    [[maybe_unused]] int32_t esi, int32_t edi, [[maybe_unused]] int32_t ebp)
 {
     int32_t sprite_index = edi;
     if (sprite_index == SPRITE_INDEX_NULL)
@@ -84,13 +74,8 @@ void game_command_callback_hire_new_staff_member(
 }
 
 void game_command_callback_pickup_staff(
-    int32_t eax,
-    int32_t ebx,
-    int32_t ecx,
-    [[maybe_unused]] int32_t edx,
-    [[maybe_unused]] int32_t esi,
-    [[maybe_unused]] int32_t edi,
-    [[maybe_unused]] int32_t ebp)
+    int32_t eax, int32_t ebx, int32_t ecx, [[maybe_unused]] int32_t edx, [[maybe_unused]] int32_t esi,
+    [[maybe_unused]] int32_t edi, [[maybe_unused]] int32_t ebp)
 {
     switch (ecx)
     {
@@ -123,13 +108,8 @@ bool _stationConstructed;
 bool _deferClose;
 
 void game_command_callback_place_ride_entrance_or_exit(
-    [[maybe_unused]] int32_t eax,
-    [[maybe_unused]] int32_t ebx,
-    [[maybe_unused]] int32_t ecx,
-    [[maybe_unused]] int32_t edx,
-    [[maybe_unused]] int32_t esi,
-    [[maybe_unused]] int32_t edi,
-    [[maybe_unused]] int32_t ebp)
+    [[maybe_unused]] int32_t eax, [[maybe_unused]] int32_t ebx, [[maybe_unused]] int32_t ecx, [[maybe_unused]] int32_t edx,
+    [[maybe_unused]] int32_t esi, [[maybe_unused]] int32_t edi, [[maybe_unused]] int32_t ebp)
 {
     audio_play_sound_at_location(SOUND_PLACE_ITEM, gCommandPosition.x, gCommandPosition.y, gCommandPosition.z);
 
@@ -156,12 +136,7 @@ void game_command_callback_place_ride_entrance_or_exit(
  *  rct2: 0x006CA162
  */
 money32 place_provisional_track_piece(
-    int32_t rideIndex,
-    int32_t trackType,
-    int32_t trackDirection,
-    int32_t liftHillAndAlternativeState,
-    int32_t x,
-    int32_t y,
+    int32_t rideIndex, int32_t trackType, int32_t trackDirection, int32_t liftHillAndAlternativeState, int32_t x, int32_t y,
     int32_t z)
 {
     Ride* ride;
@@ -200,13 +175,8 @@ money32 place_provisional_track_piece(
     else
     {
         result = game_do_command(
-            x,
-            105 | (trackDirection << 8),
-            y,
-            rideIndex | (trackType << 8) | (liftHillAndAlternativeState << 16),
-            GAME_COMMAND_PLACE_TRACK,
-            z,
-            0);
+            x, 105 | (trackDirection << 8), y, rideIndex | (trackType << 8) | (liftHillAndAlternativeState << 16),
+            GAME_COMMAND_PLACE_TRACK, z, 0);
         if (result == MONEY32_UNDEFINED)
             return result;
 
@@ -364,14 +334,8 @@ static std::tuple<bool, uint8_t> window_ride_construction_update_state_get_track
  * @return (CF)
  */
 bool window_ride_construction_update_state(
-    int32_t* _trackType,
-    int32_t* _trackDirection,
-    int32_t* _rideIndex,
-    int32_t* _liftHillAndAlternativeState,
-    int32_t* _x,
-    int32_t* _y,
-    int32_t* _z,
-    int32_t* _properties)
+    int32_t* _trackType, int32_t* _trackDirection, int32_t* _rideIndex, int32_t* _liftHillAndAlternativeState, int32_t* _x,
+    int32_t* _y, int32_t* _z, int32_t* _properties)
 {
     uint8_t trackType, trackDirection, rideIndex;
     uint16_t z, x, y, liftHillAndAlternativeState, properties;
@@ -665,13 +629,8 @@ void window_ride_construction_update_active_elements()
 }
 
 void game_command_callback_place_banner(
-    [[maybe_unused]] int32_t eax,
-    int32_t ebx,
-    [[maybe_unused]] int32_t ecx,
-    [[maybe_unused]] int32_t edx,
-    [[maybe_unused]] int32_t esi,
-    int32_t edi,
-    [[maybe_unused]] int32_t ebp)
+    [[maybe_unused]] int32_t eax, int32_t ebx, [[maybe_unused]] int32_t ecx, [[maybe_unused]] int32_t edx,
+    [[maybe_unused]] int32_t esi, int32_t edi, [[maybe_unused]] int32_t ebp)
 {
     if (ebx != MONEY32_UNDEFINED)
     {
diff --git a/src/openrct2/world/Balloon.cpp b/src/openrct2/world/Balloon.cpp
index 3aa1ed1a34..dcfae4f13f 100644
--- a/src/openrct2/world/Balloon.cpp
+++ b/src/openrct2/world/Balloon.cpp
@@ -125,13 +125,8 @@ void balloon_update(rct_balloon* balloon)
 }
 
 void game_command_balloon_press(
-    int32_t* eax,
-    int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    [[maybe_unused]] int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    int32_t* eax, int32_t* ebx, [[maybe_unused]] int32_t* ecx, [[maybe_unused]] int32_t* edx, [[maybe_unused]] int32_t* esi,
+    [[maybe_unused]] int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     *ebx = game_command_balloon_press(*eax & 0xFFFF, *ebx & 0xFF);
 }
diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp
index 26569d455e..65f853e4df 100644
--- a/src/openrct2/world/Banner.cpp
+++ b/src/openrct2/world/Banner.cpp
@@ -165,13 +165,7 @@ static money32 BannerSetColour(int16_t x, int16_t y, uint8_t baseHeight, uint8_t
 }
 
 static money32 BannerPlace(
-    int16_t x,
-    int16_t y,
-    uint8_t pathBaseHeight,
-    uint8_t direction,
-    uint8_t colour,
-    uint8_t type,
-    BannerIndex* bannerIndex,
+    int16_t x, int16_t y, uint8_t pathBaseHeight, uint8_t direction, uint8_t colour, uint8_t type, BannerIndex* bannerIndex,
     uint8_t flags)
 {
     gCommandPosition.x = x + 16;
@@ -492,10 +486,7 @@ void fix_duplicated_banners()
                     if (activeBanners[bannerIndex])
                     {
                         log_info(
-                            "Duplicated banner with index %d found at x = %d, y = %d and z = %d.",
-                            bannerIndex,
-                            x,
-                            y,
+                            "Duplicated banner with index %d found at x = %d, y = %d and z = %d.", bannerIndex, x, y,
                             tileElement->base_height);
 
                         // Banner index is already in use by another banner, so duplicate it
@@ -544,12 +535,7 @@ void fix_duplicated_banners()
  *  rct2: 0x006BA058
  */
 void game_command_remove_banner(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     *ebx = BannerRemove(*eax & 0xFFFF, *ecx & 0xFFFF, *edx & 0xFF, (*edx >> 8) & 0xFF, *ebx & 0xFF);
@@ -560,12 +546,7 @@ void game_command_remove_banner(
  *  rct2: 0x006BA16A
  */
 void game_command_set_banner_colour(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi,
     int32_t* ebp)
 {
     *ebx = BannerSetColour(*eax & 0xFFFF, *ecx & 0xFFFF, *edx & 0xFF, (*edx >> 8) & 0xFF, *ebp & 0xFF, *ebx & 0xFF);
@@ -579,23 +560,12 @@ void game_command_place_banner(
     int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi, int32_t* ebp)
 {
     *ebx = BannerPlace(
-        *eax & 0xFFFF,
-        *ecx & 0xFFFF,
-        *edx & 0xFF,
-        (*edx >> 8) & 0xFF,
-        *ebp & 0xFF,
-        (*ebx >> 8) & 0xFF,
-        (BannerIndex*)edi,
+        *eax & 0xFFFF, *ecx & 0xFFFF, *edx & 0xFF, (*edx >> 8) & 0xFF, *ebp & 0xFF, (*ebx >> 8) & 0xFF, (BannerIndex*)edi,
         *ebx & 0xFF);
 }
 
 void game_command_set_banner_style(
-    [[maybe_unused]] int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
+    [[maybe_unused]] int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi,
     int32_t* ebp)
 {
     *ebx = BannerSetStyle(*ecx & 0xFF, *edx & 0xFF, *edi & 0xFF, *ebp & 0xFF, *ebx & 0xFF);
diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp
index 11838d1c4d..345331d21d 100644
--- a/src/openrct2/world/Entrance.cpp
+++ b/src/openrct2/world/Entrance.cpp
@@ -421,11 +421,7 @@ static money32 RideEntranceExitPlaceGhost(
         x,
         (GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_GHOST)
             | (direction << 8),
-        y,
-        rideIndex | (placeType << 8),
-        GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT,
-        stationNum,
-        0);
+        y, rideIndex | (placeType << 8), GAME_COMMAND_PLACE_RIDE_ENTRANCE_OR_EXIT, stationNum, 0);
 }
 
 /**
@@ -433,12 +429,7 @@ static money32 RideEntranceExitPlaceGhost(
  *  rct2: 0x00666A63
  */
 void game_command_remove_park_entrance(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     *ebx = ParkEntranceRemove(*eax & 0xFFFF, *ecx & 0xFFFF, *edx & 0xFF, *ebx & 0xFF);
@@ -454,13 +445,8 @@ void park_entrance_remove_ghost()
     {
         gParkEntranceGhostExists = false;
         game_do_command(
-            gParkEntranceGhostPosition.x,
-            GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_APPLY,
-            gParkEntranceGhostPosition.y,
-            gParkEntranceGhostPosition.z,
-            GAME_COMMAND_REMOVE_PARK_ENTRANCE,
-            0,
-            0);
+            gParkEntranceGhostPosition.x, GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_APPLY,
+            gParkEntranceGhostPosition.y, gParkEntranceGhostPosition.z, GAME_COMMAND_REMOVE_PARK_ENTRANCE, 0, 0);
     }
 }
 
@@ -492,12 +478,8 @@ void ride_entrance_exit_place_provisional_ghost()
     if (_currentTrackSelectionFlags & TRACK_SELECTION_FLAG_ENTRANCE_OR_EXIT)
     {
         RideEntranceExitPlaceGhost(
-            _currentRideIndex,
-            gRideEntranceExitGhostPosition.x,
-            gRideEntranceExitGhostPosition.y,
-            gRideEntranceExitGhostPosition.direction,
-            gRideEntranceExitPlaceType,
-            gRideEntranceExitGhostStationIndex);
+            _currentRideIndex, gRideEntranceExitGhostPosition.x, gRideEntranceExitGhostPosition.y,
+            gRideEntranceExitGhostPosition.direction, gRideEntranceExitPlaceType, gRideEntranceExitGhostStationIndex);
     }
 }
 
@@ -508,11 +490,8 @@ void ride_entrance_exit_remove_ghost()
         game_do_command(
             gRideEntranceExitGhostPosition.x,
             (GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_APPLY),
-            gRideEntranceExitGhostPosition.y,
-            _currentRideIndex,
-            GAME_COMMAND_REMOVE_RIDE_ENTRANCE_OR_EXIT,
-            gRideEntranceExitGhostStationIndex,
-            0);
+            gRideEntranceExitGhostPosition.y, _currentRideIndex, GAME_COMMAND_REMOVE_RIDE_ENTRANCE_OR_EXIT,
+            gRideEntranceExitGhostStationIndex, 0);
     }
 }
 
@@ -542,22 +521,11 @@ money32 ride_entrance_exit_place_ghost(
  *  rct2: 0x006660A8
  */
 void game_command_place_ride_entrance_or_exit(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     *ebx = RideEntranceExitPlace(
-        *eax & 0xFFFF,
-        *ecx & 0xFFFF,
-        *edx & 0xFF,
-        (*ebx >> 8) & 0xFF,
-        *ebx & 0xFF,
-        *edx & 0xFF,
-        *edi & 0xFF,
+        *eax & 0xFFFF, *ecx & 0xFFFF, *edx & 0xFF, (*ebx >> 8) & 0xFF, *ebx & 0xFF, *edx & 0xFF, *edi & 0xFF,
         ((*edx >> 8) & 0xFF) != 0);
 }
 
@@ -566,12 +534,7 @@ void game_command_place_ride_entrance_or_exit(
  *  rct2: 0x0066640B
  */
 void game_command_remove_ride_entrance_or_exit(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     *ebx = RideEntranceExitRemove(*eax & 0xFFFF, *ecx & 0xFFFF, *edx & 0xFF, *edi & 0xFF, *ebx & 0xFF);
diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp
index 9fdc1d75ed..156486af2b 100644
--- a/src/openrct2/world/Footpath.cpp
+++ b/src/openrct2/world/Footpath.cpp
@@ -412,14 +412,7 @@ static money32 footpath_element_update(
 }
 
 static money32 footpath_place_real(
-    int32_t type,
-    int32_t x,
-    int32_t y,
-    int32_t z,
-    int32_t slope,
-    int32_t flags,
-    uint8_t pathItemType,
-    bool clearDirection,
+    int32_t type, int32_t x, int32_t y, int32_t z, int32_t slope, int32_t flags, uint8_t pathItemType, bool clearDirection,
     int32_t direction)
 {
     rct_tile_element* tileElement;
@@ -610,15 +603,8 @@ void game_command_place_footpath(
     int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi, int32_t* ebp)
 {
     *ebx = footpath_place_real(
-        (*edx >> 8) & 0xFF,
-        *eax & 0xFFFF,
-        *ecx & 0xFFFF,
-        *edx & 0xFF,
-        (*ebx >> 8) & 0xFF,
-        *ebx & 0xFF,
-        *edi & 0xFF,
-        (*ebp & FOOTPATH_CLEAR_DIRECTIONAL) >> 8,
-        *ebp & 0xFF);
+        (*edx >> 8) & 0xFF, *eax & 0xFFFF, *ecx & 0xFFFF, *edx & 0xFF, (*ebx >> 8) & 0xFF, *ebx & 0xFF, *edi & 0xFF,
+        (*ebp & FOOTPATH_CLEAR_DIRECTIONAL) >> 8, *ebp & 0xFF);
 }
 
 static money32 footpath_place_from_track(
@@ -764,22 +750,12 @@ static money32 footpath_place_from_track(
  *  rct2: 0x006A68AE
  */
 void game_command_place_footpath_from_track(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     *ebx = footpath_place_from_track(
-        (*edx >> 8) & 0xFF,
-        *eax & 0xFFFF,
-        *ecx & 0xFFFF,
-        *edx & 0xFF,
-        ((*ebx >> 13) & 0x3) | ((*ebx >> 10) & 0x4),
-        (*ebx >> 8) & 0xF,
-        *ebx & 0xFF);
+        (*edx >> 8) & 0xFF, *eax & 0xFFFF, *ecx & 0xFFFF, *edx & 0xFF, ((*ebx >> 13) & 0x3) | ((*ebx >> 10) & 0x4),
+        (*ebx >> 8) & 0xF, *ebx & 0xFF);
 }
 
 /**
@@ -787,12 +763,7 @@ void game_command_place_footpath_from_track(
  *  rct2: 0x006A67C0
  */
 void game_command_remove_footpath(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     *ebx = footpath_remove_real((*eax & 0xFFFF), (*ecx & 0xFFFF), (*edx & 0xFF), (*ebx & 0xFF));
@@ -826,11 +797,7 @@ money32 footpath_provisional_set(int32_t type, int32_t x, int32_t y, int32_t z,
     footpath_provisional_remove();
 
     cost = footpath_place(
-        type,
-        x,
-        y,
-        z,
-        slope,
+        type, x, y, z, slope,
         GAME_COMMAND_FLAG_GHOST | GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_4 | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED
             | GAME_COMMAND_FLAG_APPLY);
     if (cost != MONEY32_UNDEFINED)
@@ -890,9 +857,7 @@ void footpath_provisional_remove()
         gFootpathProvisionalFlags &= ~PROVISIONAL_PATH_FLAG_1;
 
         footpath_remove(
-            gFootpathProvisionalPosition.x,
-            gFootpathProvisionalPosition.y,
-            gFootpathProvisionalPosition.z,
+            gFootpathProvisionalPosition.x, gFootpathProvisionalPosition.y, gFootpathProvisionalPosition.z,
             GAME_COMMAND_FLAG_APPLY | GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED | GAME_COMMAND_FLAG_5 | GAME_COMMAND_FLAG_GHOST);
     }
 }
@@ -936,26 +901,14 @@ void footpath_get_coordinates_from_pos(
     LocationXY16 position = {};
 
     get_map_coordinates_from_pos(
-        screenX,
-        screenY,
-        VIEWPORT_INTERACTION_MASK_FOOTPATH,
-        &position.x,
-        &position.y,
-        &interactionType,
-        &myTileElement,
+        screenX, screenY, VIEWPORT_INTERACTION_MASK_FOOTPATH, &position.x, &position.y, &interactionType, &myTileElement,
         &viewport);
     if (interactionType != VIEWPORT_INTERACTION_ITEM_FOOTPATH
         || !(viewport->flags & (VIEWPORT_FLAG_UNDERGROUND_INSIDE | VIEWPORT_FLAG_HIDE_BASE | VIEWPORT_FLAG_HIDE_VERTICAL)))
     {
         get_map_coordinates_from_pos(
-            screenX,
-            screenY,
-            VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_TERRAIN,
-            &position.x,
-            &position.y,
-            &interactionType,
-            &myTileElement,
-            &viewport);
+            screenX, screenY, VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_TERRAIN, &position.x, &position.y,
+            &interactionType, &myTileElement, &viewport);
         if (interactionType == VIEWPORT_INTERACTION_ITEM_NONE)
         {
             if (x != nullptr)
@@ -1068,14 +1021,9 @@ void footpath_bridge_get_info_from_pos(
     }
 
     get_map_coordinates_from_pos(
-        screenX,
-        screenY,
-        VIEWPORT_INTERACTION_MASK_RIDE & VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_TERRAIN,
-        &map_pos.x,
-        &map_pos.y,
-        &interactionType,
-        tileElement,
-        &viewport);
+        screenX, screenY,
+        VIEWPORT_INTERACTION_MASK_RIDE & VIEWPORT_INTERACTION_MASK_FOOTPATH & VIEWPORT_INTERACTION_MASK_TERRAIN, &map_pos.x,
+        &map_pos.y, &interactionType, tileElement, &viewport);
     *x = map_pos.x;
     *y = map_pos.y;
     if (interactionType == VIEWPORT_INTERACTION_ITEM_RIDE && (*tileElement)->GetType() == TILE_ELEMENT_TYPE_ENTRANCE)
@@ -1453,14 +1401,8 @@ static bool footpath_disconnect_queue_from_path(int32_t x, int32_t y, rct_tile_e
  *  rct2: 0x006A6D7E
  */
 static void loc_6A6D7E(
-    int32_t initialX,
-    int32_t initialY,
-    int32_t z,
-    int32_t direction,
-    rct_tile_element* initialTileElement,
-    int32_t flags,
-    bool query,
-    rct_neighbour_list* neighbourList)
+    int32_t initialX, int32_t initialY, int32_t z, int32_t direction, rct_tile_element* initialTileElement, int32_t flags,
+    bool query, rct_neighbour_list* neighbourList)
 {
     int32_t x = initialX + CoordsDirectionDelta[direction].x;
     int32_t y = initialY + CoordsDirectionDelta[direction].y;
@@ -1536,10 +1478,7 @@ static void loc_6A6D7E(
                             if (query)
                             {
                                 neighbour_list_push(
-                                    neighbourList,
-                                    8,
-                                    direction,
-                                    tileElement->properties.entrance.ride_index,
+                                    neighbourList, 8, direction, tileElement->properties.entrance.ride_index,
                                     tileElement->properties.entrance.index);
                             }
                             else
@@ -1569,10 +1508,7 @@ static void loc_6A6D7E(
                 if (connected_path_count[tileElement->properties.path.edges & FOOTPATH_PROPERTIES_EDGES_EDGES_MASK] < 2)
                 {
                     neighbour_list_push(
-                        neighbourList,
-                        4,
-                        direction,
-                        tileElement->properties.path.ride_index,
+                        neighbourList, 4, direction, tileElement->properties.path.ride_index,
                         tileElement->properties.entrance.index);
                 }
                 else
@@ -1583,10 +1519,7 @@ static void loc_6A6D7E(
                         if (footpath_disconnect_queue_from_path(x, y, tileElement, 0))
                         {
                             neighbour_list_push(
-                                neighbourList,
-                                3,
-                                direction,
-                                tileElement->properties.path.ride_index,
+                                neighbourList, 3, direction, tileElement->properties.path.ride_index,
                                 tileElement->properties.entrance.index);
                         }
                     }
@@ -1625,12 +1558,7 @@ loc_6A6FD2:
 }
 
 static void loc_6A6C85(
-    int32_t x,
-    int32_t y,
-    int32_t direction,
-    rct_tile_element* tileElement,
-    int32_t flags,
-    bool query,
+    int32_t x, int32_t y, int32_t direction, rct_tile_element* tileElement, int32_t flags, bool query,
     rct_neighbour_list* neighbourList)
 {
     if (query && fence_in_the_way(x, y, tileElement->base_height, tileElement->clearance_height, direction))
@@ -1973,13 +1901,7 @@ static bool get_next_direction(int32_t edges, int32_t* direction)
  *              (1 << 7): Ignore no entry signs
  */
 static int32_t footpath_is_connected_to_map_edge_recurse(
-    int32_t x,
-    int32_t y,
-    int32_t z,
-    int32_t direction,
-    int32_t flags,
-    int32_t level,
-    int32_t distanceFromJunction,
+    int32_t x, int32_t y, int32_t z, int32_t direction, int32_t flags, int32_t level, int32_t distanceFromJunction,
     int32_t junctionTolerance)
 {
     rct_tile_element* tileElement;
@@ -2749,11 +2671,7 @@ void footpath_remove_edges_at(int32_t x, int32_t y, rct_tile_element* tileElemen
         {
             int32_t z0 = z1 - 2;
             footpath_remove_edges_towards(
-                x + CoordsDirectionDelta[direction].x,
-                y + CoordsDirectionDelta[direction].y,
-                z0,
-                z1,
-                direction,
+                x + CoordsDirectionDelta[direction].x, y + CoordsDirectionDelta[direction].y, z0, z1, direction,
                 footpath_element_is_queue(tileElement));
         }
         else
diff --git a/src/openrct2/world/Fountain.cpp b/src/openrct2/world/Fountain.cpp
index a12713e996..245b440d6b 100644
--- a/src/openrct2/world/Fountain.cpp
+++ b/src/openrct2/world/Fountain.cpp
@@ -94,13 +94,8 @@ void jumping_fountain_begin(int32_t type, int32_t x, int32_t y, const rct_tile_e
             for (int32_t i = 0; i < 4; i++)
             {
                 jumping_fountain_create(
-                    type,
-                    x + _fountainDirectionsPositive[i].x,
-                    y + _fountainDirectionsPositive[i].y,
-                    z,
-                    _fountainDirections[i],
-                    _fountainDirectionFlags[i] | _fountainPatternFlags[pattern],
-                    0);
+                    type, x + _fountainDirectionsPositive[i].x, y + _fountainDirectionsPositive[i].y, z, _fountainDirections[i],
+                    _fountainDirectionFlags[i] | _fountainPatternFlags[pattern], 0);
             }
             break;
         case PATTERN::BOUNCING_PAIRS:
@@ -109,47 +104,27 @@ void jumping_fountain_begin(int32_t type, int32_t x, int32_t y, const rct_tile_e
             for (int32_t i = randomIndex; i < 4; i += 2)
             {
                 jumping_fountain_create(
-                    type,
-                    x + _fountainDirectionsPositive[i].x,
-                    y + _fountainDirectionsPositive[i].y,
-                    z,
-                    _fountainDirections[i],
-                    _fountainDirectionFlags[i] | _fountainPatternFlags[pattern],
-                    0);
+                    type, x + _fountainDirectionsPositive[i].x, y + _fountainDirectionsPositive[i].y, z, _fountainDirections[i],
+                    _fountainDirectionFlags[i] | _fountainPatternFlags[pattern], 0);
             }
             break;
         case PATTERN::RACING_PAIRS:
             // random [0 - 3 and 4 - 7]
             randomIndex = scenario_rand() & 3;
             jumping_fountain_create(
-                type,
-                x + _fountainDirectionsPositive[randomIndex].x,
-                y + _fountainDirectionsPositive[randomIndex].y,
-                z,
-                _fountainDirections[randomIndex],
-                _fountainDirectionFlags[randomIndex] | _fountainPatternFlags[pattern],
-                0);
+                type, x + _fountainDirectionsPositive[randomIndex].x, y + _fountainDirectionsPositive[randomIndex].y, z,
+                _fountainDirections[randomIndex], _fountainDirectionFlags[randomIndex] | _fountainPatternFlags[pattern], 0);
             randomIndex += 4;
             jumping_fountain_create(
-                type,
-                x + _fountainDirectionsPositive[randomIndex].x,
-                y + _fountainDirectionsPositive[randomIndex].y,
-                z,
-                _fountainDirections[randomIndex],
-                _fountainDirectionFlags[randomIndex] | _fountainPatternFlags[pattern],
-                0);
+                type, x + _fountainDirectionsPositive[randomIndex].x, y + _fountainDirectionsPositive[randomIndex].y, z,
+                _fountainDirections[randomIndex], _fountainDirectionFlags[randomIndex] | _fountainPatternFlags[pattern], 0);
             break;
         default:
             // random [0 - 7]
             randomIndex = scenario_rand() & 7;
             jumping_fountain_create(
-                type,
-                x + _fountainDirectionsPositive[randomIndex].x,
-                y + _fountainDirectionsPositive[randomIndex].y,
-                z,
-                _fountainDirections[randomIndex],
-                _fountainDirectionFlags[randomIndex] | _fountainPatternFlags[pattern],
-                0);
+                type, x + _fountainDirectionsPositive[randomIndex].x, y + _fountainDirectionsPositive[randomIndex].y, z,
+                _fountainDirections[randomIndex], _fountainDirectionFlags[randomIndex] | _fountainPatternFlags[pattern], 0);
             break;
     }
 }
@@ -375,24 +350,14 @@ static void jumping_fountain_split(
             if (availableDirections & (1 << direction))
             {
                 jumping_fountain_create(
-                    type,
-                    x,
-                    y,
-                    z,
-                    direction >> 1,
-                    jumpingFountain->fountain_flags & ~FOUNTAIN_FLAG::DIRECTION,
+                    type, x, y, z, direction >> 1, jumpingFountain->fountain_flags & ~FOUNTAIN_FLAG::DIRECTION,
                     jumpingFountain->iteration + 1);
             }
             direction++;
             if (availableDirections & (1 << direction))
             {
                 jumping_fountain_create(
-                    type,
-                    x,
-                    y,
-                    z,
-                    direction >> 1,
-                    jumpingFountain->fountain_flags | FOUNTAIN_FLAG::DIRECTION,
+                    type, x, y, z, direction >> 1, jumpingFountain->fountain_flags | FOUNTAIN_FLAG::DIRECTION,
                     jumpingFountain->iteration + 1);
             }
         }
diff --git a/src/openrct2/world/Map.cpp b/src/openrct2/world/Map.cpp
index 2ce7e3e5ac..1ee5e39589 100644
--- a/src/openrct2/world/Map.cpp
+++ b/src/openrct2/world/Map.cpp
@@ -808,12 +808,7 @@ bool map_is_location_owned_or_has_rights(int32_t x, int32_t y)
  *  rct2: 0x006B8E1B
  */
 void game_command_remove_large_scenery(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     uint8_t base_height = *edx;
@@ -877,10 +872,10 @@ void game_command_remove_large_scenery(
     }
 
     rct_scenery_entry* scenery_entry = get_large_scenery_entry(scenery_large_get_type(tileElement));
-    LocationXYZ16 firstTile = { scenery_entry->large_scenery.tiles[tileIndex].x_offset,
-                                scenery_entry->large_scenery.tiles[tileIndex].y_offset,
-                                static_cast<int16_t>(
-                                    (base_height * 8) - scenery_entry->large_scenery.tiles[tileIndex].z_offset) };
+    LocationXYZ16 firstTile = {
+        scenery_entry->large_scenery.tiles[tileIndex].x_offset, scenery_entry->large_scenery.tiles[tileIndex].y_offset,
+        static_cast<int16_t>((base_height * 8) - scenery_entry->large_scenery.tiles[tileIndex].z_offset)
+    };
 
     rotate_map_coordinates(&firstTile.x, &firstTile.y, tile_element_direction);
 
@@ -974,12 +969,7 @@ void game_command_remove_large_scenery(
  *  rct2: 0x006B909A
  */
 void game_command_set_large_scenery_colour(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi,
     int32_t* ebp)
 {
     gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING;
@@ -1013,10 +1003,10 @@ void game_command_set_large_scenery_colour(
     rct_scenery_entry* scenery_entry = get_large_scenery_entry(scenery_large_get_type(tile_element));
 
     // Work out the base tile coordinates (Tile with index 0)
-    LocationXYZ16 baseTile = { scenery_entry->large_scenery.tiles[tileIndex].x_offset,
-                               scenery_entry->large_scenery.tiles[tileIndex].y_offset,
-                               static_cast<int16_t>(
-                                   (base_height * 8) - scenery_entry->large_scenery.tiles[tileIndex].z_offset) };
+    LocationXYZ16 baseTile = {
+        scenery_entry->large_scenery.tiles[tileIndex].x_offset, scenery_entry->large_scenery.tiles[tileIndex].y_offset,
+        static_cast<int16_t>((base_height * 8) - scenery_entry->large_scenery.tiles[tileIndex].z_offset)
+    };
     rotate_map_coordinates(&baseTile.x, &baseTile.y, tile_element_direction);
     baseTile.x = x - baseTile.x;
     baseTile.y = y - baseTile.y;
@@ -1249,11 +1239,7 @@ void game_command_clear_scenery(
     int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi, int32_t* ebp)
 {
     *ebx = map_clear_scenery(
-        (int16_t)(*eax & 0xFFFF),
-        (int16_t)(*ecx & 0xFFFF),
-        (int16_t)(*edi & 0xFFFF),
-        (int16_t)(*ebp & 0xFFFF),
-        *edx,
+        (int16_t)(*eax & 0xFFFF), (int16_t)(*ecx & 0xFFFF), (int16_t)(*edi & 0xFFFF), (int16_t)(*ebp & 0xFFFF), *edx,
         *ebx & 0xFF);
 }
 
@@ -1407,13 +1393,8 @@ void game_command_change_surface_style(
     int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi, int32_t* ebp)
 {
     *ebx = map_change_surface_style(
-        (int16_t)(*eax & 0xFFFF),
-        (int16_t)(*ecx & 0xFFFF),
-        (int16_t)(*edi & 0xFFFF),
-        (int16_t)(*ebp & 0xFFFF),
-        *edx & 0xFF,
-        (*edx & 0xFF00) >> 8,
-        *ebx & 0xFF);
+        (int16_t)(*eax & 0xFFFF), (int16_t)(*ecx & 0xFFFF), (int16_t)(*edi & 0xFFFF), (int16_t)(*ebp & 0xFFFF), *edx & 0xFF,
+        (*edx & 0xFF00) >> 8, *ebx & 0xFF);
 }
 
 // 0x00981A1E
@@ -1473,10 +1454,7 @@ static constexpr const uint8_t tile_element_lower_styles[9][32] = {
  *  rct2: 0x00663CB9
  */
 static int32_t map_set_land_height_clear_func(
-    rct_tile_element** tile_element,
-    [[maybe_unused]] int32_t x,
-    [[maybe_unused]] int32_t y,
-    [[maybe_unused]] uint8_t flags,
+    rct_tile_element** tile_element, [[maybe_unused]] int32_t x, [[maybe_unused]] int32_t y, [[maybe_unused]] uint8_t flags,
     [[maybe_unused]] money32* price)
 {
     if ((*tile_element)->GetType() == TILE_ELEMENT_TYPE_SURFACE)
@@ -1773,12 +1751,7 @@ static money32 map_set_land_height(int32_t flags, int32_t x, int32_t y, int32_t
 }
 
 void game_command_set_land_height(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     *ebx = map_set_land_height(*ebx & 0xFF, *eax & 0xFFFF, *ecx & 0xFFFF, *edx & 0xFF, (*edx >> 8) & 0xFF);
@@ -1881,14 +1854,7 @@ static uint8_t map_get_highest_land_height(int32_t xMin, int32_t xMax, int32_t y
 }
 
 static money32 raise_land(
-    int32_t flags,
-    int32_t x,
-    int32_t y,
-    int32_t z,
-    int32_t point_a_x,
-    int32_t point_a_y,
-    int32_t point_b_x,
-    int32_t point_b_y,
+    int32_t flags, int32_t x, int32_t y, int32_t z, int32_t point_a_x, int32_t point_a_y, int32_t point_b_x, int32_t point_b_y,
     int32_t selectionType)
 {
     money32 cost = 0;
@@ -1950,14 +1916,7 @@ static money32 raise_land(
 }
 
 static money32 lower_land(
-    int32_t flags,
-    int32_t x,
-    int32_t y,
-    int32_t z,
-    int32_t point_a_x,
-    int32_t point_a_y,
-    int32_t point_b_x,
-    int32_t point_b_y,
+    int32_t flags, int32_t x, int32_t y, int32_t z, int32_t point_a_x, int32_t point_a_y, int32_t point_b_x, int32_t point_b_y,
     int32_t selectionType)
 {
     money32 cost = 0;
@@ -2212,15 +2171,8 @@ void game_command_raise_land(
     int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi, int32_t* ebp)
 {
     *ebx = raise_land(
-        *ebx,
-        *eax,
-        *ecx,
-        tile_element_height(*eax, *ecx),
-        (int16_t)(*edx & 0xFFFF),
-        (int16_t)(*ebp & 0xFFFF),
-        *edx >> 16,
-        *ebp >> 16,
-        *edi & 0xFFFF);
+        *ebx, *eax, *ecx, tile_element_height(*eax, *ecx), (int16_t)(*edx & 0xFFFF), (int16_t)(*ebp & 0xFFFF), *edx >> 16,
+        *ebp >> 16, *edi & 0xFFFF);
 }
 
 /**
@@ -2231,15 +2183,8 @@ void game_command_lower_land(
     int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi, int32_t* ebp)
 {
     *ebx = lower_land(
-        *ebx,
-        *eax,
-        *ecx,
-        tile_element_height(*eax, *ecx),
-        (int16_t)(*edx & 0xFFFF),
-        (int16_t)(*ebp & 0xFFFF),
-        *edx >> 16,
-        *ebp >> 16,
-        *edi & 0xFFFF);
+        *ebx, *eax, *ecx, tile_element_height(*eax, *ecx), (int16_t)(*edx & 0xFFFF), (int16_t)(*ebp & 0xFFFF), *edx >> 16,
+        *ebp >> 16, *edi & 0xFFFF);
 }
 
 static money32 smooth_land_tile(
@@ -2269,18 +2214,8 @@ static money32 smooth_land_tile(
 }
 
 static money32 smooth_land_row_by_edge(
-    int32_t flags,
-    int32_t x,
-    int32_t y,
-    int32_t expectedLandHeight1,
-    int32_t expectedLandHeight2,
-    int32_t stepX,
-    int32_t stepY,
-    int32_t direction1,
-    int32_t direction2,
-    int32_t checkDirection1,
-    int32_t checkDirection2,
-    bool raiseLand)
+    int32_t flags, int32_t x, int32_t y, int32_t expectedLandHeight1, int32_t expectedLandHeight2, int32_t stepX, int32_t stepY,
+    int32_t direction1, int32_t direction2, int32_t checkDirection1, int32_t checkDirection2, bool raiseLand)
 {
     uint8_t shouldContinue = 0xF;
     int32_t landChangePerTile = raiseLand ? -2 : 2;
@@ -2421,15 +2356,8 @@ static money32 smooth_land_row_by_edge(
 }
 
 static money32 smooth_land_row_by_corner(
-    int32_t flags,
-    int32_t x,
-    int32_t y,
-    int32_t expectedLandHeight,
-    int32_t stepX,
-    int32_t stepY,
-    int32_t direction,
-    int32_t checkDirection,
-    bool raiseLand)
+    int32_t flags, int32_t x, int32_t y, int32_t expectedLandHeight, int32_t stepX, int32_t stepY, int32_t direction,
+    int32_t checkDirection, bool raiseLand)
 {
     bool shouldContinue = true;
     rct_tile_element *tileElement, *nextTileElement;
@@ -2514,13 +2442,7 @@ static money32 smooth_land_row_by_corner(
 }
 
 static money32 smooth_land(
-    int32_t flags,
-    int32_t centreX,
-    int32_t centreY,
-    int32_t mapLeft,
-    int32_t mapTop,
-    int32_t mapRight,
-    int32_t mapBottom,
+    int32_t flags, int32_t centreX, int32_t centreY, int32_t mapLeft, int32_t mapTop, int32_t mapRight, int32_t mapBottom,
     int32_t command)
 {
     // break up information in command
@@ -2809,12 +2731,7 @@ void game_command_smooth_land(
  *  rct2: 0x006E66A0
  */
 void game_command_raise_water(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    [[maybe_unused]] int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, [[maybe_unused]] int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi,
     int32_t* ebp)
 {
     *ebx = raise_water(
@@ -2826,12 +2743,7 @@ void game_command_raise_water(
  *  rct2: 0x006E6878
  */
 void game_command_lower_water(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    [[maybe_unused]] int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, [[maybe_unused]] int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi,
     int32_t* ebp)
 {
     *ebx = lower_water(
@@ -2843,12 +2755,7 @@ void game_command_lower_water(
  *  rct2: 0x006E650F
  */
 void game_command_set_water_height(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     int32_t x = *eax;
@@ -3104,14 +3011,7 @@ void game_command_place_large_scenery(
 
         if (!gCheatsDisableClearanceChecks
             && !map_can_construct_with_clear_at(
-                   curTile.x,
-                   curTile.y,
-                   zLow,
-                   zHigh,
-                   &map_place_scenery_clear_func,
-                   bl,
-                   flags,
-                   &supportsCost,
+                   curTile.x, curTile.y, zLow, zHigh, &map_place_scenery_clear_func, bl, flags, &supportsCost,
                    CREATE_CROSSING_MODE_NONE))
         {
             *ebx = MONEY32_UNDEFINED;
@@ -3408,8 +3308,7 @@ void map_reorganise_elements()
     num_elements = (uint32_t)(new_elements_pointer - new_tile_elements);
     memcpy(gTileElements, new_tile_elements, num_elements * sizeof(rct_tile_element));
     memset(
-        gTileElements + num_elements,
-        0,
+        gTileElements + num_elements, 0,
         (3 * (MAXIMUM_MAP_SIZE_TECHNICAL * MAXIMUM_MAP_SIZE_TECHNICAL) - num_elements) * sizeof(rct_tile_element));
 
     free(new_tile_elements);
@@ -3582,14 +3481,7 @@ void map_obstruction_set_error_text(rct_tile_element* tileElement)
  *  bl = bl
  */
 bool map_can_construct_with_clear_at(
-    int32_t x,
-    int32_t y,
-    int32_t zLow,
-    int32_t zHigh,
-    CLEAR_FUNC clearFunc,
-    uint8_t bl,
-    uint8_t flags,
-    money32* price,
+    int32_t x, int32_t y, int32_t zLow, int32_t zHigh, CLEAR_FUNC clearFunc, uint8_t bl, uint8_t flags, money32* price,
     uint8_t crossingMode)
 {
     int32_t al, ah, bh, cl, ch, water_height;
@@ -3929,11 +3821,8 @@ void map_restore_provisional_elements()
     {
         gFootpathProvisionalFlags &= ~PROVISIONAL_PATH_FLAG_1;
         footpath_provisional_set(
-            gFootpathProvisionalType,
-            gFootpathProvisionalPosition.x,
-            gFootpathProvisionalPosition.y,
-            gFootpathProvisionalPosition.z,
-            gFootpathProvisionalSlope);
+            gFootpathProvisionalType, gFootpathProvisionalPosition.x, gFootpathProvisionalPosition.y,
+            gFootpathProvisionalPosition.z, gFootpathProvisionalSlope);
     }
     if (window_find_by_class(WC_RIDE_CONSTRUCTION) != nullptr)
     {
@@ -4109,24 +3998,14 @@ static void clear_element_at(int32_t x, int32_t y, rct_tile_element** elementPtr
         case TILE_ELEMENT_TYPE_LARGE_SCENERY:
             gGameCommandErrorTitle = STR_CANT_REMOVE_THIS;
             game_do_command(
-                x,
-                (GAME_COMMAND_FLAG_APPLY) | (tile_element_get_direction(element) << 8),
-                y,
-                (element->base_height) | (scenery_large_get_sequence(element) << 8),
-                GAME_COMMAND_REMOVE_LARGE_SCENERY,
-                0,
-                0);
+                x, (GAME_COMMAND_FLAG_APPLY) | (tile_element_get_direction(element) << 8), y,
+                (element->base_height) | (scenery_large_get_sequence(element) << 8), GAME_COMMAND_REMOVE_LARGE_SCENERY, 0, 0);
             break;
         case TILE_ELEMENT_TYPE_BANNER:
             gGameCommandErrorTitle = STR_CANT_REMOVE_THIS;
             game_do_command(
-                x,
-                GAME_COMMAND_FLAG_APPLY,
-                y,
-                (element->base_height) | ((element->properties.banner.position & 3) << 8),
-                GAME_COMMAND_REMOVE_BANNER,
-                0,
-                0);
+                x, GAME_COMMAND_FLAG_APPLY, y, (element->base_height) | ((element->properties.banner.position & 3) << 8),
+                GAME_COMMAND_REMOVE_BANNER, 0, 0);
             break;
         default:
             tile_element_remove(element);
@@ -4302,14 +4181,7 @@ rct_tile_element* map_get_small_scenery_element_at(int32_t x, int32_t y, int32_t
 }
 
 bool map_large_scenery_get_origin(
-    int32_t x,
-    int32_t y,
-    int32_t z,
-    int32_t direction,
-    int32_t sequence,
-    int32_t* outX,
-    int32_t* outY,
-    int32_t* outZ,
+    int32_t x, int32_t y, int32_t z, int32_t direction, int32_t sequence, int32_t* outX, int32_t* outY, int32_t* outZ,
     rct_tile_element** outElement)
 {
     rct_tile_element* tileElement;
@@ -4610,12 +4482,7 @@ void map_clear_all_elements()
 }
 
 void game_command_set_sign_style(
-    [[maybe_unused]] int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
+    [[maybe_unused]] int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi,
     int32_t* ebp)
 {
     BannerIndex bannerId = *ecx & 0xFF;
@@ -4683,13 +4550,8 @@ void game_command_set_sign_style(
         }
 
         if (!sign_set_colour(
-                banner->x * 32,
-                banner->y * 32,
-                tileElement->base_height,
-                tile_element_get_direction(tileElement),
-                scenery_large_get_sequence(tileElement),
-                mainColour,
-                textColour))
+                banner->x * 32, banner->y * 32, tileElement->base_height, tile_element_get_direction(tileElement),
+                scenery_large_get_sequence(tileElement), mainColour, textColour))
         {
             *ebx = MONEY32_UNDEFINED;
             return;
diff --git a/src/openrct2/world/Map.h b/src/openrct2/world/Map.h
index c83c40dd5e..15d80f0cda 100644
--- a/src/openrct2/world/Map.h
+++ b/src/openrct2/world/Map.h
@@ -171,14 +171,7 @@ using CLEAR_FUNC = int32_t (*)(rct_tile_element** tile_element, int32_t x, int32
 int32_t map_place_non_scenery_clear_func(rct_tile_element** tile_element, int32_t x, int32_t y, uint8_t flags, money32* price);
 int32_t map_place_scenery_clear_func(rct_tile_element** tile_element, int32_t x, int32_t y, uint8_t flags, money32* price);
 bool map_can_construct_with_clear_at(
-    int32_t x,
-    int32_t y,
-    int32_t zLow,
-    int32_t zHigh,
-    CLEAR_FUNC clearFunc,
-    uint8_t bl,
-    uint8_t flags,
-    money32* price,
+    int32_t x, int32_t y, int32_t zLow, int32_t zHigh, CLEAR_FUNC clearFunc, uint8_t bl, uint8_t flags, money32* price,
     uint8_t crossingMode);
 int32_t map_can_construct_at(int32_t x, int32_t y, int32_t zLow, int32_t zHigh, uint8_t bl);
 void rotate_map_coordinates(int16_t* x, int16_t* y, int32_t rotation);
@@ -187,15 +180,8 @@ money32 map_clear_scenery(int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_
 money32 lower_water(int16_t x0, int16_t y0, int16_t x1, int16_t y1, uint8_t flags);
 money32 raise_water(int16_t x0, int16_t y0, int16_t x1, int16_t y1, uint8_t flags);
 money32 wall_place(
-    int32_t type,
-    int32_t x,
-    int32_t y,
-    int32_t z,
-    int32_t edge,
-    int32_t primaryColour,
-    int32_t secondaryColour,
-    int32_t tertiaryColour,
-    int32_t flags);
+    int32_t type, int32_t x, int32_t y, int32_t z, int32_t edge, int32_t primaryColour, int32_t secondaryColour,
+    int32_t tertiaryColour, int32_t flags);
 
 void game_command_set_land_height(
     int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp);
@@ -285,14 +271,7 @@ void map_clear_all_elements();
 
 rct_tile_element* map_get_large_scenery_segment(int32_t x, int32_t y, int32_t z, int32_t direction, int32_t sequence);
 bool map_large_scenery_get_origin(
-    int32_t x,
-    int32_t y,
-    int32_t z,
-    int32_t direction,
-    int32_t sequence,
-    int32_t* outX,
-    int32_t* outY,
-    int32_t* outZ,
+    int32_t x, int32_t y, int32_t z, int32_t direction, int32_t sequence, int32_t* outX, int32_t* outY, int32_t* outZ,
     rct_tile_element** outElement);
 
 void map_offset_with_rotation(int16_t* x, int16_t* y, int16_t offsetX, int16_t offsetY, uint8_t rotation);
diff --git a/src/openrct2/world/MoneyEffect.cpp b/src/openrct2/world/MoneyEffect.cpp
index cf4d5cd8ac..adf6b26cf0 100644
--- a/src/openrct2/world/MoneyEffect.cpp
+++ b/src/openrct2/world/MoneyEffect.cpp
@@ -71,11 +71,8 @@ void money_effect_create(money32 value)
 
         rct_viewport* mainViewport = window_get_viewport(mainWindow);
         screen_get_map_xy(
-            mainViewport->x + (mainViewport->width / 2),
-            mainViewport->y + (mainViewport->height / 2),
-            &mapPosition.x,
-            &mapPosition.y,
-            nullptr);
+            mainViewport->x + (mainViewport->width / 2), mainViewport->y + (mainViewport->height / 2), &mapPosition.x,
+            &mapPosition.y, nullptr);
         if (mapPosition.x == LOCATION_NULL)
             return;
 
diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp
index 457430496d..7bd8449dab 100644
--- a/src/openrct2/world/Park.cpp
+++ b/src/openrct2/world/Park.cpp
@@ -118,13 +118,8 @@ void park_set_open(int32_t open)
  *  rct2: 0x00669D4A
  */
 void game_command_set_park_open(
-    [[maybe_unused]] int32_t* eax,
-    int32_t* ebx,
-    [[maybe_unused]] int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    int32_t* edi,
-    [[maybe_unused]] int32_t* ebp)
+    [[maybe_unused]] int32_t* eax, int32_t* ebx, [[maybe_unused]] int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi,
+    int32_t* edi, [[maybe_unused]] int32_t* ebp)
 {
     if (!(*ebx & GAME_COMMAND_FLAG_APPLY))
     {
diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp
index c553855317..c046e93bda 100644
--- a/src/openrct2/world/Scenery.cpp
+++ b/src/openrct2/world/Scenery.cpp
@@ -226,13 +226,8 @@ void scenery_remove_ghost_tool_placement()
                 continue;
 
             game_do_command(
-                x,
-                233 | (gSceneryPlacePathSlope << 8),
-                y,
-                z | (gSceneryPlacePathType << 8),
-                GAME_COMMAND_PLACE_PATH,
-                gSceneryGhostPathObjectType & 0xFFFF0000,
-                0);
+                x, 233 | (gSceneryPlacePathSlope << 8), y, z | (gSceneryPlacePathType << 8), GAME_COMMAND_PLACE_PATH,
+                gSceneryGhostPathObjectType & 0xFFFF0000, 0);
             break;
         } while (!(tileElement++)->IsLastForTile());
     }
diff --git a/src/openrct2/world/SmallScenery.cpp b/src/openrct2/world/SmallScenery.cpp
index 8cc67c384e..dd8983be34 100644
--- a/src/openrct2/world/SmallScenery.cpp
+++ b/src/openrct2/world/SmallScenery.cpp
@@ -111,14 +111,8 @@ static money32 SmallSceneryRemove(
 }
 
 static money32 SmallScenerySetColour(
-    int16_t x,
-    int16_t y,
-    uint8_t baseHeight,
-    uint8_t quadrant,
-    uint8_t sceneryType,
-    uint8_t primaryColour,
-    uint8_t secondaryColour,
-    uint8_t flags)
+    int16_t x, int16_t y, uint8_t baseHeight, uint8_t quadrant, uint8_t sceneryType, uint8_t primaryColour,
+    uint8_t secondaryColour, uint8_t flags)
 {
     gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING;
     int32_t z = baseHeight * 8;
@@ -158,15 +152,8 @@ static money32 SmallScenerySetColour(
 }
 
 static money32 SmallSceneryPlace(
-    int16_t x,
-    int16_t y,
-    int16_t targetHeight,
-    uint8_t quadrant,
-    uint8_t rotation,
-    uint8_t sceneryType,
-    uint8_t primaryColour,
-    uint8_t secondaryColour,
-    uint8_t flags)
+    int16_t x, int16_t y, int16_t targetHeight, uint8_t quadrant, uint8_t rotation, uint8_t sceneryType, uint8_t primaryColour,
+    uint8_t secondaryColour, uint8_t flags)
 {
     gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING;
 
@@ -362,14 +349,7 @@ static money32 SmallSceneryPlace(
 
     if (!gCheatsDisableClearanceChecks
         && !map_can_construct_with_clear_at(
-               x,
-               y,
-               zLow,
-               zHigh,
-               &map_place_scenery_clear_func,
-               blSupports | collisionQuadrants,
-               flags,
-               &clearCost,
+               x, y, zLow, zHigh, &map_place_scenery_clear_func, blSupports | collisionQuadrants, flags, &clearCost,
                CREATE_CROSSING_MODE_NONE))
     {
         return MONEY32_UNDEFINED;
@@ -434,12 +414,7 @@ static money32 SmallSceneryPlace(
  *  rct2: 0x006E0E01
  */
 void game_command_remove_scenery(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi,
     [[maybe_unused]] int32_t* ebp)
 {
     *ebx = SmallSceneryRemove(
@@ -451,23 +426,12 @@ void game_command_remove_scenery(
  *  rct2: 0x006E0F26
  */
 void game_command_set_scenery_colour(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi,
     int32_t* ebp)
 {
     *ebx = SmallScenerySetColour(
-        *eax & 0xFFFF,
-        *ecx & 0xFFFF,
-        *edx & 0xFF,
-        ((*ebx >> 8) & 0xFF) >> 6,
-        (*edx >> 8) & 0xFF,
-        *ebp & 0xFF,
-        (*ebp >> 8) & 0xFF,
-        *ebx & 0xFF);
+        *eax & 0xFFFF, *ecx & 0xFFFF, *edx & 0xFF, ((*ebx >> 8) & 0xFF) >> 6, (*edx >> 8) & 0xFF, *ebp & 0xFF,
+        (*ebp >> 8) & 0xFF, *ebx & 0xFF);
 }
 
 /**
@@ -549,15 +513,8 @@ void game_command_place_scenery(
     int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi, int32_t* ebp)
 {
     *ebx = SmallSceneryPlace(
-        *eax & 0xFFFF,
-        *ecx & 0xFFFF,
-        *ebp & 0xFFFF,
-        *edx & 0xFF,
-        *edi & 0xFF,
-        (*ebx >> 8) & 0xFF,
-        (*edx >> 8) & 0xFF,
-        (*edi >> 16) & 0xFF,
-        *ebx & 0xFF);
+        *eax & 0xFFFF, *ecx & 0xFFFF, *ebp & 0xFFFF, *edx & 0xFF, *edi & 0xFF, (*ebx >> 8) & 0xFF, (*edx >> 8) & 0xFF,
+        (*edi >> 16) & 0xFF, *ebx & 0xFF);
 }
 
 int32_t scenery_small_get_primary_colour(const rct_tile_element* tileElement)
diff --git a/src/openrct2/world/Sprite.cpp b/src/openrct2/world/Sprite.cpp
index d5d8fcfb75..bc7bdfa11d 100644
--- a/src/openrct2/world/Sprite.cpp
+++ b/src/openrct2/world/Sprite.cpp
@@ -87,10 +87,7 @@ static void invalidate_sprite_max_zoom(rct_sprite* sprite, int32_t maxZoom)
         if (viewport->width != 0 && viewport->zoom <= maxZoom)
         {
             viewport_invalidate(
-                viewport,
-                sprite->unknown.sprite_left,
-                sprite->unknown.sprite_top,
-                sprite->unknown.sprite_right,
+                viewport, sprite->unknown.sprite_left, sprite->unknown.sprite_top, sprite->unknown.sprite_right,
                 sprite->unknown.sprite_bottom);
         }
     }
@@ -844,10 +841,8 @@ void sprite_position_tween_all(float alpha)
                 continue;
             }
             sprite_set_coordinates(
-                std::round(posB.x * alpha + posA.x * inv),
-                std::round(posB.y * alpha + posA.y * inv),
-                std::round(posB.z * alpha + posA.z * inv),
-                sprite);
+                std::round(posB.x * alpha + posA.x * inv), std::round(posB.y * alpha + posA.y * inv),
+                std::round(posB.z * alpha + posA.z * inv), sprite);
             invalidate_sprite_2(sprite);
         }
     }
diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp
index 6905149281..7324127363 100644
--- a/src/openrct2/world/TileInspector.cpp
+++ b/src/openrct2/world/TileInspector.cpp
@@ -676,14 +676,12 @@ int32_t tile_inspector_entrance_make_usable(int32_t x, int32_t y, int32_t elemen
         {
             case ENTRANCE_TYPE_RIDE_ENTRANCE:
                 ride_set_entrance_location(
-                    ride,
-                    stationIndex,
+                    ride, stationIndex,
                     { x, y, entranceElement->base_height, (uint8_t)tile_element_get_direction(entranceElement) });
                 break;
             case ENTRANCE_TYPE_RIDE_EXIT:
                 ride_set_exit_location(
-                    ride,
-                    stationIndex,
+                    ride, stationIndex,
                     { x, y, entranceElement->base_height, (uint8_t)tile_element_get_direction(entranceElement) });
                 break;
         }
diff --git a/src/openrct2/world/Wall.cpp b/src/openrct2/world/Wall.cpp
index 2d73bd3480..b14432a7a1 100644
--- a/src/openrct2/world/Wall.cpp
+++ b/src/openrct2/world/Wall.cpp
@@ -295,15 +295,8 @@ static constexpr const uint8_t EdgeSlopes[][4] = {
 #pragma endregion
 
 static money32 WallPlace(
-    uint8_t wallType,
-    int16_t x,
-    int16_t y,
-    int16_t z,
-    uint8_t edge,
-    uint8_t primaryColour,
-    uint8_t secondaryColour,
-    uint8_t tertiaryColour,
-    uint8_t flags)
+    uint8_t wallType, int16_t x, int16_t y, int16_t z, uint8_t edge, uint8_t primaryColour, uint8_t secondaryColour,
+    uint8_t tertiaryColour, uint8_t flags)
 {
     LocationXYZ16 position = { x, y, z };
 
@@ -562,14 +555,8 @@ static money32 WallPlace(
 }
 
 static money32 WallSetColour(
-    int16_t x,
-    int16_t y,
-    uint8_t baseHeight,
-    uint8_t direction,
-    uint8_t primaryColour,
-    uint8_t secondaryColour,
-    uint8_t tertiaryColour,
-    uint8_t flags)
+    int16_t x, int16_t y, uint8_t baseHeight, uint8_t direction, uint8_t primaryColour, uint8_t secondaryColour,
+    uint8_t tertiaryColour, uint8_t flags)
 {
     gCommandExpenditureType = RCT_EXPENDITURE_TYPE_LANDSCAPING;
     int32_t z = baseHeight * 8;
@@ -732,27 +719,13 @@ void game_command_place_wall(
     int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, int32_t* edi, int32_t* ebp)
 {
     *ebx = WallPlace(
-        (*ebx >> 8) & 0xFF,
-        *eax & 0xFFFF,
-        *ecx & 0xFFFF,
-        *edi & 0xFFFF,
-        *edx & 0xFF,
-        (*edx >> 8) & 0xFF,
-        *ebp & 0xFF,
-        (*ebp >> 8) & 0xFF,
-        *ebx & 0xFF);
+        (*ebx >> 8) & 0xFF, *eax & 0xFFFF, *ecx & 0xFFFF, *edi & 0xFFFF, *edx & 0xFF, (*edx >> 8) & 0xFF, *ebp & 0xFF,
+        (*ebp >> 8) & 0xFF, *ebx & 0xFF);
 }
 
 money32 wall_place(
-    int32_t type,
-    int32_t x,
-    int32_t y,
-    int32_t z,
-    int32_t edge,
-    int32_t primaryColour,
-    int32_t secondaryColour,
-    int32_t tertiaryColour,
-    int32_t flags)
+    int32_t type, int32_t x, int32_t y, int32_t z, int32_t edge, int32_t primaryColour, int32_t secondaryColour,
+    int32_t tertiaryColour, int32_t flags)
 {
     int32_t eax = x;
     int32_t ebx = flags | (type << 8);
@@ -770,21 +743,10 @@ money32 wall_place(
  *  rct2: 0x006E56B5
  */
 void game_command_set_wall_colour(
-    int32_t* eax,
-    int32_t* ebx,
-    int32_t* ecx,
-    int32_t* edx,
-    [[maybe_unused]] int32_t* esi,
-    [[maybe_unused]] int32_t* edi,
+    int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, [[maybe_unused]] int32_t* esi, [[maybe_unused]] int32_t* edi,
     int32_t* ebp)
 {
     *ebx = WallSetColour(
-        *eax & 0xFFFF,
-        *ecx & 0xFFFF,
-        (*edx >> 8) & 0xFF,
-        *edx & 0xFF,
-        (*ebx >> 8) & 0xFF,
-        *ebp & 0xFF,
-        (*ebp >> 8) & 0xFF,
+        *eax & 0xFFFF, *ecx & 0xFFFF, (*edx >> 8) & 0xFF, *edx & 0xFF, (*ebx >> 8) & 0xFF, *ebp & 0xFF, (*ebp >> 8) & 0xFF,
         *ebx & 0xFF);
 }